From df9acac6801f1515f4aade76bc28299bff627247 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 3 Mar 2016 17:37:50 -0800 Subject: [PATCH] Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S Target assembly files do not get these cflags, align the host definitions to do the same. Change-Id: Idadfa1f367c3ebea44460c5798225a85dd319371 --- core/definitions.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index aa5d67df9d..325f90f07e 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1295,13 +1295,12 @@ $(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \ $(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 @@ -1325,7 +1324,7 @@ endef 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