Skip to content

Commit

Permalink
Let nocopts also filter copts
Browse files Browse the repository at this point in the history
RELNOTES: nocopts now also filter copts
PiperOrigin-RevId: 162944771
  • Loading branch information
hlopko authored and buchgr committed Jul 24, 2017
1 parent 1b548c7 commit ad42824
Showing 1 changed file with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,7 @@ public List<String> getCompilerOptions(
}
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
Expand Down

0 comments on commit ad42824

Please sign in to comment.