commit 8c4b0d4e35f0f4d0af4cc1a282fdc30c9414801b
author brandjon <brandjon@google.com> Tue Mar 10 09:12:00 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 10 09:13:24 2020 -0700
tree c5fc509609b940ed5a22fa2499c2db792afbb969
parent 9aa3f1699c49421669521a101177eb865d58c551

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

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 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()))