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

Change-Id: I8448feb55b54515856798c1b3e8070d0e07e0b6c
This commit is contained in:
Dan Willemsen 2016-05-16 18:04:45 -07:00
parent 3772da13fd
commit b436fdee65
1 changed files with 4 additions and 4 deletions

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,