diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-18 23:00:57 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-18 23:00:57 -0700 |
| commit | d26a713dcac8a2fa750d69751d29bfdfa8fd7717 (patch) | |
| tree | a1671ff7e61d170f0bdf58e0843e1be068a35473 /cc | |
| parent | c264c16638aa51caacd1b0d203a536b8b35491c0 (diff) | |
| download | build_soong-d26a713dcac8a2fa750d69751d29bfdfa8fd7717.tar.gz build_soong-d26a713dcac8a2fa750d69751d29bfdfa8fd7717.tar.bz2 build_soong-d26a713dcac8a2fa750d69751d29bfdfa8fd7717.zip | |
Fix makevars (C|LD)FLAGS ordering
This better matches the order from cc/cc.go, so that any implicit
ordering behaves the same in Make and Soong.
Change-Id: I802d725f037a22c4b2f0ae28258af95efa37ce79
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/makevars.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index 3e72a7a2..cdc8bcc2 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -82,11 +82,11 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, } ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{ - toolchain.ToolchainCflags(), + toolchain.Cflags(), "${commonGlobalCflags}", fmt.Sprintf("${%sGlobalCflags}", hod), + toolchain.ToolchainCflags(), productExtraCflags, - toolchain.Cflags(), }, " ")) ctx.StrictSorted(makePrefix+"GLOBAL_CONLYFLAGS", "") ctx.StrictSorted(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{ @@ -94,9 +94,9 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, toolchain.Cppflags(), }, " ")) ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ + toolchain.Ldflags(), toolchain.ToolchainLdflags(), productExtraLdflags, - toolchain.Ldflags(), }, " ")) if toolchain.ClangSupported() { @@ -107,13 +107,12 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, } ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{ - toolchain.ToolchainClangCflags(), + toolchain.ClangCflags(), "${commonClangGlobalCflags}", - "${clangExtraCflags}", fmt.Sprintf("${%sClangGlobalCflags}", hod), - productExtraCflags, - toolchain.ClangCflags(), + toolchain.ToolchainClangCflags(), clangExtras, + productExtraCflags, }, " ")) ctx.StrictSorted(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}") ctx.StrictSorted(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{ @@ -121,9 +120,9 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, toolchain.ClangCppflags(), }, " ")) ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ + toolchain.ClangLdflags(), toolchain.ToolchainClangLdflags(), productExtraLdflags, - toolchain.ClangLdflags(), clangExtras, }, " ")) } |