StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't set -pie for windows modules"

Browse Source
This commit is contained in:
Colin Cross
2018-09-20 00:00:42 +00:00
committed by Gerrit Code Review
parent 185cce598b feb4a7e4ae
commit a70669e4a5
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/binary.mk
View File

@@ -281,13 +281,18 @@ endif
# all code is position independent, and then those warnings get promoted to # all code is position independent, and then those warnings get promoted to
# errors. # errors.
ifneq ($(LOCAL_NO_PIC),true) ifneq ($(LOCAL_NO_PIC),true)
ifneq ($($(my_prefix)OS),windows) ifneq ($($(my_prefix)OS),windows)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),) ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
my_cflags += -fPIE my_cflags += -fPIE
else ifndef BUILD_HOST_static
my_cflags += -fPIC ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
endif my_ldflags += -pie
endif endif
endif
else
my_cflags += -fPIC
endif
endif
endif endif
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE

5
core/definitions.mk
View File

@@ -1879,11 +1879,6 @@ 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 := -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

12
core/host_executable.mk
View File

@@ -11,10 +11,6 @@ my_module_multilib := first
endif endif
endif endif
ifeq ($(LOCAL_NO_FPIE),)
LOCAL_LDFLAGS += $(HOST_FPIE_FLAGS)
endif
ifeq ($(my_module_multilib),both) ifeq ($(my_module_multilib),both)
ifneq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS) ifneq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),) ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),)
@@ -63,10 +59,6 @@ LOCAL_BUILT_MODULE :=
LOCAL_INSTALLED_MODULE := LOCAL_INSTALLED_MODULE :=
LOCAL_INTERMEDIATE_TARGETS := LOCAL_INTERMEDIATE_TARGETS :=
ifeq ($(LOCAL_NO_FPIE),)
LOCAL_LDFLAGS += $(HOST_CROSS_FPIE_FLAGS)
endif
include $(BUILD_SYSTEM)/host_executable_internal.mk include $(BUILD_SYSTEM)/host_executable_internal.mk
LOCAL_LDFLAGS := $(saved_LOCAL_LDFLAGS) LOCAL_LDFLAGS := $(saved_LOCAL_LDFLAGS)
LOCAL_BUILT_MODULE := $(saved_LOCAL_BUILT_MODULE) LOCAL_BUILT_MODULE := $(saved_LOCAL_BUILT_MODULE)
@@ -85,10 +77,6 @@ LOCAL_BUILT_MODULE :=
LOCAL_INSTALLED_MODULE := LOCAL_INSTALLED_MODULE :=
LOCAL_INTERMEDIATE_TARGETS := LOCAL_INTERMEDIATE_TARGETS :=
ifeq ($(LOCAL_NO_FPIE),)
LOCAL_LDFLAGS += $(HOST_CROSS_FPIE_FLAGS)
endif
include $(BUILD_SYSTEM)/host_executable_internal.mk include $(BUILD_SYSTEM)/host_executable_internal.mk
LOCAL_LDFLAGS := $(saved_LOCAL_LDFLAGS) LOCAL_LDFLAGS := $(saved_LOCAL_LDFLAGS)
LOCAL_BUILT_MODULE := $(saved_LOCAL_BUILT_MODULE) LOCAL_BUILT_MODULE := $(saved_LOCAL_BUILT_MODULE)