aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar hlopko <hlopko@google.com>2017-09-20 15:02:20 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-09-20 16:37:09 +0200
commit0e9236b47599fe04a2fee2454cac900633b2df0b (patch)
treee607558847b7f951a3a9a2590bae3ea4d473c0e8 /src/main/java/com/google/devtools/build
parent17214ac78ffaec369d5d5bafe62a39730473cfaa (diff)
Do not put sysroot into unfiltered_compile_flags
Now that we have dedicated sysroot variable, it is not necessary to have it in unfiltered_compile_flags (actually, it's bad to have it here because it assumes --sysroot= flag, and that doesn't work cross-platform). RELNOTES: None. PiperOrigin-RevId: 169384693
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
index 42a596c992..b7a8e6062f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
@@ -500,7 +500,7 @@ public final class CppModel {
*/
public static Supplier<ImmutableList<String>> getUnfilteredCompileFlagsSupplier(
CcToolchainProvider ccToolchain, ImmutableSet<String> features) {
- return () -> ccToolchain.getUnfilteredCompilerOptionsWithSysroot(features);
+ return () -> ccToolchain.getUnfilteredCompilerOptions(features);
}
/**