diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2015-04-02 17:23:13 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2015-04-03 20:36:36 +0000 |
| commit | eedbb0369e584794e49b5fd1118acf718128d105 (patch) | |
| tree | e3b96ab4a5f2ebf415f135cebf86ccd10bd721a4 /src/main/java/com/google | |
| parent | 4544389bcf149b63579c9ebb59bd0dabe1e0b381 (diff) | |
Automated [] rollback of [].
*** Reason for rollback ***
Breaks bazel for /usr/bin/gcc. It needs -B to find ld, because we don't supply a $PATH.
*** Original change description ***
Remove unnecessary -B flag from linker command line.
This should fix working with GCC cross compilers installed into
/usr/bin/ next to the host ld.
--
MOS_MIGRATED_REVID=90173200
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 3 |
1 files changed, 2 insertions, 1 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 2dfdac0a03..b3cdf3b82b 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,6 +861,7 @@ 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"); } @@ -987,7 +988,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}. |