aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar hlopko <hlopko@google.com>2018-08-08 01:02:57 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-08-08 01:04:21 -0700
commit510681357b4a4225af530670bca9898a2ed14af1 (patch)
tree8c62d22de35bc0f2eff0d3265d880d209cd1af36 /src/main
parent3a711882dcbb3af8709844bde501ac6fca44ea7d (diff)
Disable legacy linking Skylark api to C++ toolchain
RELNOTES: None. PiperOrigin-RevId: 207845945
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
index 6a7219c68f..dcd569ac66 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
@@ -395,7 +395,7 @@ public class BazelCppRuleClasses {
.add(attr("nocopts", STRING))
/*<!-- #BLAZE_RULE($cc_rule).ATTRIBUTE(linkstatic) -->
For <a href="${link cc_binary}"><code>cc_binary</code></a> and
- <a href="${link cc_test}"><code>cc_test</code></a>: link the binary in mostly-static
+ <a href="${link cc_test}"><code>cc_test</code></a>: link the binary in static
mode. For <code>cc_library.linkstatic</code>: see below.
<p>
By default this option is on for <code>cc_binary</code> and off for the rest.
@@ -409,13 +409,13 @@ public class BazelCppRuleClasses {
</p>
<p>There are really three different ways to link an executable:</p>
<ul>
- <li> FULLY STATIC, in which everything is linked statically; e.g. "<code>gcc -static
- foo.o libbar.a libbaz.a -lm</code>".<br/>
- This mode is enabled by specifying <code>-static</code> in the
- <a href="#cc_binary.linkopts"><code>linkopts</code></a> attribute.</li>
- <li> MOSTLY STATIC, in which all user libraries are linked statically (if a static
- version is available), but where system libraries are linked dynamically, e.g.
- "<code>gcc foo.o libfoo.a libbaz.a -lm</code>".<br/>
+ <li> STATIC with fully_static_link feature, in which everything is linked statically;
+ e.g. "<code>gcc -static foo.o libbar.a libbaz.a -lm</code>".<br/>
+ This mode is enabled by specifying <code>fully_static_link</code> in the
+ <a href="#cc_binary.features"><code>features</code></a> attribute.</li>
+ <li> STATIC, in which all user libraries are linked statically (if a static
+ version is available), but where system libraries (excluding C/C++ runtime libraries)
+ are linked dynamically, e.g. "<code>gcc foo.o libfoo.a libbaz.a -lm</code>".<br/>
This mode is enabled by specifying <code>linkstatic=True</code>.</li>
<li> DYNAMIC, in which all libraries are linked dynamically (if a dynamic version is
available), e.g. "<code>gcc foo.o libfoo.so libbaz.so -lm</code>".<br/>