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

Merge "Don't pass -Wl,--no-undefined to host targets" am: fe3e1818e5

Browse Source 
am: 44d966cf6a

Change-Id: Ibbc6d1e83fb8f7ab32fef86c43ea30700f853815
This commit is contained in:
Colin Cross
2016-10-21 23:12:26 +00:00
committed by android-build-merger
parent 94632c7535 44d966cf6a
commit 4db457e030
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/binary.mk
View File

@@ -64,10 +64,11 @@ else
my_native_coverage := false
endif
my_allow_undefined_symbols := $(strip $(LOCAL_ALLOW_UNDEFINED_SYMBOLS))
ifdef SANITIZE_HOST
ifdef LOCAL_IS_HOST_MODULE
my_allow_undefined_symbols := true
else
my_allow_undefined_symbols := $(strip $(LOCAL_ALLOW_UNDEFINED_SYMBOLS))
endif
endif
my_ndk_sysroot :=
@@ -625,9 +626,18 @@ endif
# Certain modules like libdl have to have symbols resolved at runtime and blow
# up if --no-undefined is passed to the linker.
ifeq ($(strip $(LOCAL_NO_DEFAULT_COMPILER_FLAGS)),)
ifeq ($(my_allow_undefined_symbols),)
my_ldflags += -Wl,--no-undefined
endif
ifeq ($(my_allow_undefined_symbols),)
ifneq ($(HOST_OS),darwin)
my_ldflags += -Wl,--no-undefined
endif
else
ifdef LOCAL_IS_HOST_MODULE
ifeq ($(HOST_OS),darwin)
# darwin defaults to treating undefined symbols as errors
my_ldflags += -Wl,-undefined,dynamic_lookup
endif
endif
endif
endif
ifeq (true,$(LOCAL_GROUP_STATIC_LIBRARIES))