diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java | 10 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java | 4 |
2 files changed, 8 insertions, 6 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 dadd153f34..425ad995d1 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 @@ -467,11 +467,11 @@ public class BazelCppRuleClasses { /*<!-- #BLAZE_RULE($cc_binary_base).ATTRIBUTE(malloc) --> Override the default dependency on malloc. <p> - By default, Linux C++ binaries are linked against <code>//tools/cpp:malloc</code>, - which is an empty library so the binary ends up using libc malloc. This label must - refer to a <code>cc_library</code>. If compilation is for a non-C++ rule, this option - has no effect. The value of this attribute is ignored if <code>linkshared=1</code> is - specified. + By default, C++ binaries are linked against <code>//tools/cpp:malloc</code>, + which is an empty library so the binary ends up using libc malloc. + This label must refer to a <code>cc_library</code>. If compilation is for a non-C++ + rule, this option has no effect. The value of this attribute is ignored if + <code>linkshared=1</code> is specified. </p> <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/ .add(attr("malloc", LABEL) diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java index f2406ddcba..6164d8d3da 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java @@ -481,8 +481,10 @@ public abstract class MockCcSupport { protected static void createToolsCppPackage(MockToolsConfig config) throws IOException { config.create( "tools/cpp/BUILD", + "package(default_visibility = ['//visibility:public'])", "cc_library(name = 'stl')", - "alias(name='toolchain', actual='//third_party/crosstool')"); + "alias(name='toolchain', actual='//third_party/crosstool')", + "cc_library(name = 'malloc')"); } protected void createCrosstoolPackage(MockToolsConfig config, boolean addEmbeddedRuntimes) |