StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop sorting (C|CPP|LD)FLAGS when checking am: 9598e1048a

Browse Source 
am: a897cbfd33

* commit 'a897cbfd3399cd93bf2bb87a8aa6cef5bcd2a750':
  Stop sorting (C|CPP|LD)FLAGS when checking

Change-Id: I9f5f85edcfb5708d9b375e3e6fa4a46bf369bf15
This commit is contained in:
Dan Willemsen
2016-05-24 01:11:41 +00:00
committed by android-build-merger
parent f1a1389e65 a897cbfd33
commit d6e7df3545
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cc/makevars.go
View File

@@ -82,19 +82,19 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
productExtraLdflags += "-static" productExtraLdflags += "-static"
} }
ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{ ctx.Strict(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.Cflags(), toolchain.Cflags(),
"${commonGlobalCflags}", "${commonGlobalCflags}",
fmt.Sprintf("${%sGlobalCflags}", hod), fmt.Sprintf("${%sGlobalCflags}", hod),
toolchain.ToolchainCflags(), toolchain.ToolchainCflags(),
productExtraCflags, productExtraCflags,
}, " ")) }, " "))
ctx.StrictSorted(makePrefix+"GLOBAL_CONLYFLAGS", "") ctx.Strict(makePrefix+"GLOBAL_CONLYFLAGS", "")
ctx.StrictSorted(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{ ctx.Strict(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
"${commonGlobalCppflags}", "${commonGlobalCppflags}",
toolchain.Cppflags(), toolchain.Cppflags(),
}, " ")) }, " "))
ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ ctx.Strict(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.Ldflags(), toolchain.Ldflags(),
toolchain.ToolchainLdflags(), toolchain.ToolchainLdflags(),
productExtraLdflags, productExtraLdflags,
@@ -123,7 +123,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
clangExtras += " -B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin") clangExtras += " -B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin")
} }
ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{ ctx.Strict(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ClangCflags(), toolchain.ClangCflags(),
"${commonClangGlobalCflags}", "${commonClangGlobalCflags}",
fmt.Sprintf("${%sClangGlobalCflags}", hod), fmt.Sprintf("${%sClangGlobalCflags}", hod),
@@ -131,12 +131,12 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
clangExtras, clangExtras,
productExtraCflags, productExtraCflags,
}, " ")) }, " "))
ctx.StrictSorted(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}") ctx.Strict(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}")
ctx.StrictSorted(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{ ctx.Strict(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
"${commonClangGlobalCppflags}", "${commonClangGlobalCppflags}",
toolchain.ClangCppflags(), toolchain.ClangCppflags(),
}, " ")) }, " "))
ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ ctx.Strict(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ClangLdflags(), toolchain.ClangLdflags(),
toolchain.ToolchainClangLdflags(), toolchain.ToolchainClangLdflags(),
productExtraLdflags, productExtraLdflags,