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

Commit b5956468 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Disable host -fPIE if BUILD_HOST_static is set."

parents b9d6f6f1 faf3d5ed

core/definitions.mk

+6 −1
Original line number Original line Diff line number Diff line
@@ -1395,6 +1395,11 @@ endef 
###########################################################

###########################################################

## Commands for running gcc to link a host executable

## Commands for running gcc to link a host executable

###########################################################

###########################################################

ifdef BUILD_HOST_static

HOST_FPIE_FLAGS :=

else

HOST_FPIE_FLAGS := -fPIE -pie

endif





ifneq ($(HOST_CUSTOM_LD_COMMAND),true)

ifneq ($(HOST_CUSTOM_LD_COMMAND),true)

define transform-host-o-to-executable-inner

define transform-host-o-to-executable-inner
@@ -1412,7 +1417,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(HOST_GLOBAL_LD_DIRS) \

	$(HOST_GLOBAL_LD_DIRS) \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

		$(PRIVATE_HOST_GLOBAL_LDFLAGS) \

		$(PRIVATE_HOST_GLOBAL_LDFLAGS) \

		-fPIE -pie \

		$(HOST_FPIE_FLAGS) \

	) \

	) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	-o $@ \

	-o $@ \