Disable host -fPIE if BUILD_HOST_static is set.

It turns out -static doesn't work with -fPIE.

Bug: 13568878
Change-Id: I66951a5517dece1c5f4f22c329cf703bd99b5163
This commit is contained in:
Ying Wang
2014-04-04 14:37:33 -07:00
parent b9d6f6f15c
commit faf3d5ed0f

View File

@@ -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 $@ \