Fix order of C++ compiler flags:

User-specific flags need to be before system include paths.

--
MOS_MIGRATED_REVID=97425471

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
index 4a0fc051e1..4839a36388 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -1285,13 +1285,16 @@ public class CppCompileAction extends AbstractAction implements IncludeScannable
       addFilteredOptions(options,
           featureConfiguration.getCommandLine(getActionName(), variables));
 
-      options.addAll(toolchain.getUnfilteredCompilerOptions(features));
-
       // 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);
 
+      // 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
+      // own include paths first.
+      options.addAll(toolchain.getUnfilteredCompilerOptions(features));
+
       // GCC gives randomized names to symbols which are defined in
       // an anonymous namespace but have external linkage.  To make
       // computation of these deterministic, we want to override the