aboutsummaryrefslogtreecommitdiffstats
path: root/cc/builder.go
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-03-03 17:21:04 -0800
committerDan Willemsen <dwillemsen@google.com>2016-03-03 17:21:04 -0800
commitbe03f346b35e1e5ce5c74f57614dc26bf5f2dc4e (patch)
treed1ed421919c526ee2a46e9e2bd57fe907f58df21 /cc/builder.go
parentf778e12c57b9d13a65930eb656da8e456fc05ad5 (diff)
downloadbuild_soong-be03f346b35e1e5ce5c74f57614dc26bf5f2dc4e.tar.gz
build_soong-be03f346b35e1e5ce5c74f57614dc26bf5f2dc4e.tar.bz2
build_soong-be03f346b35e1e5ce5c74f57614dc26bf5f2dc4e.zip
Port GLOBAL[_CLANG]_CFLAGS_NO_OVERRIDE from make
Change-Id: I4f0f8ec7620e4477f60bf9cf1ae0c005470c89d4
Diffstat (limited to 'cc/builder.go')
-rw-r--r--cc/builder.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/cc/builder.go b/cc/builder.go
index 98f66d9f..bcfbb6ee 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -149,6 +149,14 @@ func TransformSourceToObj(ctx common.AndroidModuleContext, subdir string, srcFil
cppflags := flags.globalFlags + " " + flags.cFlags + " " + flags.cppFlags
asflags := flags.globalFlags + " " + flags.asFlags
+ if flags.clang {
+ cflags += " ${noOverrideClangGlobalCflags}"
+ cppflags += " ${noOverrideClangGlobalCflags}"
+ } else {
+ cflags += " ${noOverrideGlobalCflags}"
+ cppflags += " ${noOverrideGlobalCflags}"
+ }
+
for i, srcFile := range srcFiles {
objFile := common.ObjPathWithExt(ctx, srcFile, subdir, "o")