Let nocopts also filter copts
RELNOTES: nocopts now also filter copts
@@ -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
