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

Commit 851983bb 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

* commit '6d813d8c':
  Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
parents aa82bd62 6d813d8c

core/definitions.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -1300,13 +1300,12 @@ $(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \ 
	    $(PRIVATE_HOST_GLOBAL_CONLYFLAGS) \

	    $(PRIVATE_HOST_GLOBAL_CONLYFLAGS) \

	 ) \

	 ) \

	$(1) \

	$(1) \

	$(PRIVATE_CFLAGS_NO_OVERRIDE) \

	-MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

	-MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

endef

endef





define transform-host-c-to-o-no-deps

define transform-host-c-to-o-no-deps

@echo "$($(PRIVATE_PREFIX)DISPLAY) C: $(PRIVATE_MODULE) <= $<"

@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

endef





define transform-host-s-to-o-no-deps

define transform-host-s-to-o-no-deps
@@ -1330,7 +1329,7 @@ endef 




define transform-host-m-to-o-no-deps

define transform-host-m-to-o-no-deps

@echo "$($(PRIVATE_PREFIX)DISPLAY) ObjC: $(PRIVATE_MODULE) <= $<"

@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

endef





define transform-host-m-to-o

define transform-host-m-to-o