Merge "Do not set entry-point for Windows" am: 645b8db09a
am: 783c0bd833
Change-Id: I0c0edd3bdc25fdc7131b79e7ebd9cc8e4ea809bc
This commit is contained in:
committed by
android-build-merger
commit
8ffb008e88
@@ -1986,10 +1986,6 @@ ifdef BUILD_HOST_static
|
|||||||
HOST_FPIE_FLAGS :=
|
HOST_FPIE_FLAGS :=
|
||||||
else
|
else
|
||||||
HOST_FPIE_FLAGS := -pie
|
HOST_FPIE_FLAGS := -pie
|
||||||
# Force the correct entry point to workaround a bug in binutils that manifests with -pie
|
|
||||||
ifeq ($(HOST_CROSS_OS),windows)
|
|
||||||
HOST_CROSS_FPIE_FLAGS += -Wl,-e_mainCRTStartup
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(HOST_CUSTOM_LD_COMMAND),true)
|
ifneq ($(HOST_CUSTOM_LD_COMMAND),true)
|
||||||
|
Reference in New Issue
Block a user