diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2015-04-08 13:36:58 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-04-08 18:36:59 +0000 |
| commit | 4988a6d0a40c97e29c6b0671ca7ba4ad82fea65b (patch) | |
| tree | 039fdac275db7a6e0487c61af704851e8fc58bc7 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 59afedce5a9413f60500c1218947da2040f661da (diff) | |
Remove unnecessary -B flag from linker command line.
Relative to the last try, add -B to Linux CROSSTOOL entry, and test
the result on OSX and Linux.
This should fix working with GCC cross compilers installed into
/usr/bin/ next to the host ld.
--
MOS_MIGRATED_REVID=90605463
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 9031b721c2..d538421053 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -861,7 +861,6 @@ public class CppConfiguration extends BuildConfiguration.Fragment { List<String> result = new ArrayList<>(); result.addAll(commonLinkOptions); - result.add("-B" + ldExecutable.getParentDirectory().getPathString()); if (stripBinaries) { result.add("-Wl,-S"); } @@ -988,7 +987,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment { public CcToolchainFeatures getFeatures() { return toolchainFeatures; } - + /** * Returns the configured current compilation mode. Rules should not call this directly, but * instead use {@code CcToolchainProvider.getCompilationMode}. |