From fe5754f00dab5c10437dcdf4cb50cc2ac224a42a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 2 Apr 2015 16:29:55 +0000 Subject: 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=90167821 --- .../java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java') 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 b3cdf3b82b..2dfdac0a03 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 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}. -- cgit v1.2.3