Move global cppflags to the beginning of cppflags
Global cppflags should come first so they can be overriden by module
cppflags.
Test: m -j checkbuild
Change-Id: I3454370a6b35f37982b1e0de2e0ec52b54974a8a
diff --git a/cc/compiler.go b/cc/compiler.go
index 1798f4e..285bb69 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -245,17 +245,17 @@
if !ctx.noDefaultCompilerFlags() {
flags.GlobalFlags = append(flags.GlobalFlags, instructionSetFlags)
- flags.ConlyFlags = append(flags.ConlyFlags, "${config.CommonGlobalConlyflags}")
+ flags.ConlyFlags = append([]string{"${config.CommonGlobalConlyflags}"}, flags.ConlyFlags...)
if flags.Clang {
flags.AsFlags = append(flags.AsFlags, tc.ClangAsflags())
- flags.CppFlags = append(flags.CppFlags, "${config.CommonClangGlobalCppflags}")
+ flags.CppFlags = append([]string{"${config.CommonClangGlobalCppflags}"}, flags.CppFlags...)
flags.GlobalFlags = append(flags.GlobalFlags,
tc.ClangCflags(),
"${config.CommonClangGlobalCflags}",
fmt.Sprintf("${config.%sClangGlobalCflags}", hod))
} else {
- flags.CppFlags = append(flags.CppFlags, "${config.CommonGlobalCppflags}")
+ flags.CppFlags = append([]string{"${config.CommonGlobalCppflags}"}, flags.CppFlags...)
flags.GlobalFlags = append(flags.GlobalFlags,
tc.Cflags(),
"${config.CommonGlobalCflags}",