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

Turn on strict checking for C[PP]FLAGS make vars

Browse Source 
am: b436fdee65

* commit 'b436fdee65b2ae27576b37f1f13a324bc9c7f51a':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: If75cd0402c85326307ef6d1657c3f8153f904a38
This commit is contained in:
Dan Willemsen
2016-05-17 02:05:51 +00:00
committed by android-build-merger
parent aaaeb15c73 b436fdee65
commit fb2eaaf8f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/makevars.go
View File

@@ -74,12 +74,12 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod) globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod)
ctx.CheckSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{ ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ToolchainCflags(), toolchain.ToolchainCflags(),
globalCflags, globalCflags,
toolchain.Cflags(), toolchain.Cflags(),
}, " ")) }, " "))
ctx.CheckSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ToolchainLdflags(), toolchain.ToolchainLdflags(),
toolchain.Ldflags(), toolchain.Ldflags(),
}, " ")) }, " "))
@@ -93,13 +93,13 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod) globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod)
ctx.CheckSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{ ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ToolchainClangCflags(), toolchain.ToolchainClangCflags(),
globalClangCflags, globalClangCflags,
toolchain.ClangCflags(), toolchain.ClangCflags(),
clangExtras, clangExtras,
}, " ")) }, " "))
ctx.CheckSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ToolchainClangLdflags(), toolchain.ToolchainClangLdflags(),
toolchain.ClangLdflags(), toolchain.ClangLdflags(),
clangExtras, clangExtras,