commit f29481439809cbbb004aacf5e886aba68d26b5ba
author Tim Kilbourn <tkilbourn@google.com> Wed Mar 11 12:03:03 2015 -0700
committer Tim Kilbourn <tkilbourn@google.com> Mon Mar 16 15:50:11 2015 -0700
tree ad886f1c454159f4b927de7b1e12abd631c41289
parent 8003131d5a09ccc5c9fbaf8ddca93e5d8c4e401f

Add common cpp flags

Change-Id: Iba486b121e9a1b0c1761cf6402c61a0228105a5b

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 641d67f..0b595ec 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -86,6 +86,8 @@
 		strings.Join(clangFilterUnknownCflags(deviceGlobalCflags), " "))
 	pctx.StaticVariable("hostClangGlobalCflags",
 		strings.Join(clangFilterUnknownCflags(hostGlobalCflags), " "))
+	pctx.StaticVariable("commonClangGlobalCppflags",
+		strings.Join(clangFilterUnknownCflags(commonGlobalCppflags), " "))
 
 	// Everything in this list is a crime against abstraction and dependency tracking.
 	// Do not add anything to this list.
@@ -387,6 +389,7 @@
 		}
 
 		if flags.clang {
+			flags.cppFlags = append(flags.cppFlags, "${commonClangGlobalCppflags}")
 			flags.globalFlags = []string{
 				"${commonGlobalIncludes}",
 				toolchain.IncludeFlags(),
@@ -395,6 +398,7 @@
 				fmt.Sprintf("${%sClangGlobalCflags}", arch.HostOrDevice),
 			}
 		} else {
+			flags.cppFlags = append(flags.cppFlags, "${commonGlobalCppflags}")
 			flags.globalFlags = []string{
 				"${commonGlobalIncludes}",
 				toolchain.IncludeFlags(),