Automated rollback of commit a63507193727d2e5523d6e782b8eef40c4355243. *** Reason for rollback *** Breaks internal tests *** Original change description *** Pass default flags before custom flags to allow overriding Target-specific copts should override "default" ones coming from the objc fragment. Closes #10894. PiperOrigin-RevId: 300105092
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index 2999edf..a81f873 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -305,11 +305,11 @@ .addCcCompilationContexts(objcCompilationContext.getDepCcCompilationContexts()) .setCopts( ImmutableList.<String>builder() + .addAll(getCompileRuleCopts()) .addAll( ruleContext .getFragment(ObjcConfiguration.class) .getCoptsForCompilationMode()) - .addAll(getCompileRuleCopts()) .addAll(extraCompileArgs) .addAll( pathsToIncludeArgs(objcCompilationContext.getStrictDependencyIncludes()))