Export CONLYFLAGS and CPPFLAGS to Make
Change-Id: I061d531983b5bb544efb2f0ab5912cd2b461f58b
diff --git a/cc/makevars.go b/cc/makevars.go
index 97a26de..48698bf 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -83,6 +83,11 @@
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 @@
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(),