Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d15cf81 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S" am: 6d813d8c am: 851983bb 

am: 8b905654

* commit '8b905654':
  Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
parents dcc69084 8b905654

core/definitions.mk

+2 −3
Original line number Diff line number Diff line
@@ -1282,13 +1282,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
@@ -1312,7 +1311,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