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

Export CONLYFLAGS and CPPFLAGS to Make am: 216a459ccc

Browse Source 
am: 53ad362d24

* commit '53ad362d249e0407df457adf058b8f08ffdb9af8':
  Export CONLYFLAGS and CPPFLAGS to Make

Change-Id: Ic84f5b8864ae1cdbd8f2f7d270f0219fcac4dc0e
This commit is contained in:
Dan Willemsen
2016-05-17 19:55:06 +00:00
committed by android-build-merger
parent 224361ead4 53ad362d24
commit a2190784e0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/makevars.go
View File

@@ -83,6 +83,11 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
globalCflags, globalCflags,
toolchain.Cflags(), toolchain.Cflags(),
}, " ")) }, " "))
ctx.StrictSorted(makePrefix+"GLOBAL_CONLYFLAGS", "")
ctx.StrictSorted(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
"${commonGlobalCppflags}",
toolchain.Cppflags(),
}, " "))
ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ToolchainLdflags(), toolchain.ToolchainLdflags(),
toolchain.Ldflags(), toolchain.Ldflags(),
@@ -107,6 +112,11 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
toolchain.ClangCflags(), toolchain.ClangCflags(),
clangExtras, clangExtras,
}, " ")) }, " "))
ctx.StrictSorted(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}")
ctx.StrictSorted(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
"${commonClangGlobalCppflags}",
toolchain.ClangCppflags(),
}, " "))
ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{ ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
toolchain.ToolchainClangLdflags(), toolchain.ToolchainClangLdflags(),
toolchain.ClangLdflags(), toolchain.ClangLdflags(),