diff options
| author |  hlopko <hlopko@google.com> | 2017-07-24 18:11:15 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-24 21:04:43 +0200 |
| commit | ad42824ae02a1b2edbffe475246984e14af56dd0 (patch) | |
| tree | b04a4350c09e5131c2c44209d9be1cc8086814e2 /src | |
| parent | 1b548c71a86dca308f5c7f6393a1a5eeb85e6744 (diff) | |
Let nocopts also filter copts
RELNOTES: nocopts now also filter copts
PiperOrigin-RevId: 162944771
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java index 2df5412218..1d250c2dc3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java @@ -152,10 +152,7 @@ public final class CompileCommandLine { } addFilteredOptions(options, featureConfiguration.getCommandLine(actionName, updatedVariables)); - // Users don't expect the explicit copts to be filtered by coptsFilter, add them verbatim. - // Make sure these are added after the options from the feature configuration, so that - // those options can be overriden. - options.addAll(copts); + addFilteredOptions(options, copts); // Unfiltered compiler options contain system include paths. These must be added after // the user provided options, otherwise users adding include paths will not pick up their |