diff options
author | 2017-09-08 15:17:18 +0200 | |
---|---|---|
committer | 2017-09-11 13:06:46 +0200 | |
commit | f322ba774727597b3238c33929c7ef2071f134b4 (patch) | |
tree | 9794635aecee9c5b98eeef12cd1b341fd425b707 /src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | |
parent | e4f390420c6b6ceef93e5e620a747a6d196bd172 (diff) |
Introduce unfiltered_compile_flags build variable, rename copts variable to user_compile_flags
Also add magic to a feature named 'unfiltered_compile_flags' so the flags
expanded from it are not subject to nocopt filtering.
This is encore of https://github.com/bazelbuild/bazel/commit/268c0bcbf79f9f3f72d95fa51af0f1b18c5ce29e that was rolled back because it regressed
memory.
RELNOTES: None.
PiperOrigin-RevId: 167989075
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index c0a24572ff..f2df3dd4b1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -527,7 +527,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { "cxx-flag-A-1", "cxx-flag-A-2", "cxx-fastbuild-flag-A-1", "cxx-fastbuild-flag-A-2") .inOrder(); assertThat(ccProviderA.getUnfilteredCompilerOptions(NO_FEATURES)) - .containsExactly("--sysroot=some", "unfiltered-flag-A-1", "unfiltered-flag-A-2") + .containsExactly("unfiltered-flag-A-1", "unfiltered-flag-A-2") .inOrder(); assertThat(toolchainA.getDynamicLinkOptions(NO_FEATURES, true)) .containsExactly( |