diff options
| author | Colin Cross <ccross@android.com> | 2016-11-22 12:32:47 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-11-22 15:41:09 -0800 |
| commit | b668826a85dc3950a4ce45cc7c355ace4708d18a (patch) | |
| tree | 8acbfcfbb7555d6e18dfb6b2293ba3614ace513f /cc/compiler.go | |
| parent | 5ed99c64729f7d1cf3eaa2197277a1d6665f6f9d (diff) | |
| download | build_soong-b668826a85dc3950a4ce45cc7c355ace4708d18a.tar.gz build_soong-b668826a85dc3950a4ce45cc7c355ace4708d18a.tar.bz2 build_soong-b668826a85dc3950a4ce45cc7c355ace4708d18a.zip | |
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
Diffstat (limited to 'cc/compiler.go')
| -rw-r--r-- | cc/compiler.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/compiler.go b/cc/compiler.go index 1798f4eb..285bb692 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -245,17 +245,17 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag 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}", |