From 216a459ccc782d9b47e5663b4c3b81f0e03e2739 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 16 May 2016 23:56:53 -0700
Subject: [PATCH] Export CONLYFLAGS and CPPFLAGS to Make

Change-Id: I061d531983b5bb544efb2f0ab5912cd2b461f58b
---
 cc/makevars.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cc/makevars.go b/cc/makevars.go
index 97a26def5..48698bf82 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -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(),