From 04034343bdb60d823aaecfae03753d525b345430 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Mon, 1 Jun 2015 09:11:02 +0000 Subject: Add the --sysroot argument even if it is the default for the particular Crosstool. This makes integrating Bazel with an external Android NDK less complex, and removes a special-case from the behavior of Bazel, which is always good. -- MOS_MIGRATED_REVID=94893919 --- .../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') 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 10ba9c8f37..78570210b0 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 @@ -561,8 +561,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment { runtimeSysroot = defaultSysroot; String sysrootFlag; - if (sysroot != null && !sysroot.equals(defaultSysroot)) { - // Only specify the --sysroot option if it is different from the built-in one. + if (sysroot != null) { sysrootFlag = "--sysroot=" + sysroot; } else { sysrootFlag = null; -- cgit v1.2.3