tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 6d813d8c92

* commit '6d813d8c9223ba6e55e98f23a8a8c2248466feff':
  Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
This commit is contained in:
Dan Willemsen 2016-03-04 20:59:24 +00:00 committed by android-build-merger
commit 851983bbf2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/definitions.mk
View file

@ -1300,13 +1300,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
@ -1330,7 +1329,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