Append non-direct arguments before non-cached.

abyss7 · Jan 25, 2016 · 16c01b1 · 16c01b1
1 parent b11cbad
commit 16c01b1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/daemon/compilation_daemon.cc b/src/daemon/compilation_daemon.cc
@@ -320,8 +320,11 @@ base::ProcessPtr CompilationDaemon::CreateProcess(
   // |flags.other()| always must go first, since it contains the "-cc1" flag.
   process->AppendArg(flags.other().begin(), flags.other().end());
   process->AppendArg(Immutable(flags.action()));
-  process->AppendArg(flags.non_cached().begin(), flags.non_cached().end());
+
+  // FIXME: looks like the --internal-isystem flags order is important.
+  //        We should preserve an original order.
   process->AppendArg(flags.non_direct().begin(), flags.non_direct().end());
+  process->AppendArg(flags.non_cached().begin(), flags.non_cached().end());
 
   // TODO: render args using libclang
   for (const auto& plugin : flags.compiler().plugins()) {