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 am: 53ad362d24

Browse Source 
am: a2190784e0

* commit 'a2190784e0e4d7cebee7d571053054384ff12cb1':
  Export CONLYFLAGS and CPPFLAGS to Make

Change-Id: I9b4d5591b9afd43c1e5ab04949d3b7d1bba6f3dc
This commit is contained in:
Dan Willemsen
2016-05-17 19:58:13 +00:00
committed by android-build-merger
parent 3b4aae8a23 a2190784e0
commit 71990fae5b
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,
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{
toolchain.ToolchainLdflags(),
toolchain.Ldflags(),
@@ -107,6 +112,11 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
toolchain.ClangCflags(),
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{
toolchain.ToolchainClangLdflags(),
toolchain.ClangLdflags(),