openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Export CONLYFLAGS and CPPFLAGS to Make 

Change-Id: I061d531983b5bb544efb2f0ab5912cd2b461f58b
This commit is contained in:
Dan Willemsen 2016-05-16 23:56:53 -07:00
parent 06f453359a
commit 216a459ccc
1 changed files with 10 additions and 0 deletions
Show Stats 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(),