commit 6d813d8c9223ba6e55e98f23a8a8c2248466feff
author Dan Willemsen <dwillemsen@google.com> Fri Mar 04 20:52:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 04 20:52:57 2016 +0000
tree 9bd9a933608e38926d0477403b212bfe79599909
parent 4e677900f7b0017fcd926dc66d778e355e6a1bae
parent df9acac6801f1515f4aade76bc28299bff627247

Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index e60d3d4..66859cd 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1300,13 +1300,12 @@
 	    $(PRIVATE_HOST_GLOBAL_CONLYFLAGS) \
 	 ) \
 	$(1) \
-	$(PRIVATE_CFLAGS_NO_OVERRIDE) \
 	-MD -MF $(patsubst %.o,%.d,$@) -o $@ $<
 endef
 
 define transform-host-c-to-o-no-deps
 @echo "$($(PRIVATE_PREFIX)DISPLAY) C: $(PRIVATE_MODULE) <= $<"
-$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS))
+$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS) $(PRIVATE_CFLAGS_NO_OVERRIDE))
 endef
 
 define transform-host-s-to-o-no-deps
@@ -1330,7 +1329,7 @@
 
 define transform-host-m-to-o-no-deps
 @echo "$($(PRIVATE_PREFIX)DISPLAY) ObjC: $(PRIVATE_MODULE) <= $<"
-$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS))
+$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS) $(PRIVATE_CFLAGS_NO_OVERRIDE))
 endef
 
 define transform-host-m-to-o