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

Browse Source 
Make isn't defining these anymore, so we don't need to sort them before
comparing.

Change-Id: Ia2f13f665309569ee8c564a8fb82639d174a83bb
This commit is contained in:
Dan Willemsen
2016-05-19 16:59:04 -07:00
parent e8c5237775
commit 9598e1048a
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"
}
ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
ctx.Strict(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.Cflags(),
"${commonGlobalCflags}",
fmt.Sprintf("${%sGlobalCflags}", hod),
toolchain.ToolchainCflags(),
productExtraCflags,
}, " "))
ctx.StrictSorted(makePrefix+"GLOBAL_CONLYFLAGS", "")
ctx.StrictSorted(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
ctx.Strict(makePrefix+"GLOBAL_CONLYFLAGS", "")
ctx.Strict(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
"${commonGlobalCppflags}",
toolchain.Cppflags(),
}, " "))
ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
ctx.Strict(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.Ldflags(),
toolchain.ToolchainLdflags(),
productExtraLdflags,
@@ -123,7 +123,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
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(),
"${commonClangGlobalCflags}",
fmt.Sprintf("${%sClangGlobalCflags}", hod),
@@ -131,12 +131,12 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
clangExtras,
productExtraCflags,
}, " "))
ctx.StrictSorted(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}")
ctx.StrictSorted(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
ctx.Strict(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}")
ctx.Strict(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
"${commonClangGlobalCppflags}",
toolchain.ClangCppflags(),
}, " "))
ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
ctx.Strict(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ClangLdflags(),
toolchain.ToolchainClangLdflags(),
productExtraLdflags,