diff options
| author |  hlopko <hlopko@google.com> | 2017-09-08 15:17:18 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-11 13:06:46 +0200 |
| commit | f322ba774727597b3238c33929c7ef2071f134b4 (patch) | |
| tree | 9794635aecee9c5b98eeef12cd1b341fd425b707 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.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/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index ed46336d53..a8d3a38bbb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -250,7 +250,6 @@ public class CppCompileAction extends AbstractAction * * @param owner the owner of the action, usually the configured target that emitted it * @param allInputs the list of all action inputs. - * @param features TODO(bazel-team): Add parameter description. * @param featureConfiguration TODO(bazel-team): Add parameter description. * @param variables TODO(bazel-team): Add parameter description. * @param sourceFile the source file that should be compiled. {@code mandatoryInputs} must contain @@ -285,9 +284,6 @@ public class CppCompileAction extends AbstractAction protected CppCompileAction( ActionOwner owner, NestedSet<Artifact> allInputs, - // TODO(bazel-team): Eventually we will remove 'features'; all functionality in 'features' - // will be provided by 'featureConfiguration'. - ImmutableList<String> features, FeatureConfiguration featureConfiguration, CcToolchainFeatures.Variables variables, Artifact sourceFile, @@ -352,7 +348,6 @@ public class CppCompileAction extends AbstractAction outputFile, sourceLabel, coptsFilter, - features, actionName, cppConfiguration, dotdFile, @@ -802,7 +797,7 @@ public class CppCompileAction extends AbstractAction */ @VisibleForTesting public List<String> getCompilerOptions() { - return compileCommandLine.getCompilerOptions(/*updatedVariables=*/ null); + return compileCommandLine.getCompilerOptions(/* overwrittenVariables= */ null); } @Override |