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

Merge "Stop linking libdl.a into static bins"

Browse Source
This commit is contained in:
Ryan Prichard
2019-10-28 20:14:37 +00:00
committed by Gerrit Code Review
parent 5ec356acff acf8b0ff00
commit fe43a3f2cb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config_sanitizers.mk
View File

@@ -182,7 +182,9 @@ ifneq ($(filter hwaddress,$(my_sanitize)),)
my_shared_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_RUNTIME_LIBRARY) my_shared_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_RUNTIME_LIBRARY)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),) ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true) ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
my_static_libraries := $(my_static_libraries) $($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_STATIC_LIBRARY) my_static_libraries := $(my_static_libraries) \
$($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_STATIC_LIBRARY) \
libdl
endif endif
endif endif
endif endif

2
core/cxx_stl_setup.mk
View File

@@ -82,7 +82,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
endif endif
ifeq ($(my_link_type),static) ifeq ($(my_link_type),static)
my_static_libraries += libm libc libdl my_static_libraries += libm libc
endif endif
endif endif
else ifeq ($(my_cxx_stl),ndk) else ifeq ($(my_cxx_stl),ndk)