From 0e9236b47599fe04a2fee2454cac900633b2df0b Mon Sep 17 00:00:00 2001 From: hlopko Date: Wed, 20 Sep 2017 15:02:20 +0200 Subject: 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 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build') 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> getUnfilteredCompileFlagsSupplier( CcToolchainProvider ccToolchain, ImmutableSet features) { - return () -> ccToolchain.getUnfilteredCompilerOptionsWithSysroot(features); + return () -> ccToolchain.getUnfilteredCompilerOptions(features); } /** -- cgit v1.2.3