commit a63507193727d2e5523d6e782b8eef40c4355243
author Alessandro Patti <apatti@uber.com> Thu Mar 05 03:21:56 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Mar 05 03:22:54 2020 -0800
tree f0205fc3a2579494bb42a0a5d9cef9eb2671ad52
parent aec885585d3de5539a8d3449d73e9cef7f15eafb

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: 299062881

src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java

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 a81f873..2999edf 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()))