Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe43a3f2 authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge "Stop linking libdl.a into static bins"

parents 5ec356ac acf8b0ff

core/config_sanitizers.mk

+3 −1
Original line number Diff line number Diff line
@@ -182,7 +182,9 @@ ifneq ($(filter hwaddress,$(my_sanitize)),) 
  my_shared_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)HWADDRESS_SANITIZER_RUNTIME_LIBRARY)

  ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

    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

core/cxx_stl_setup.mk

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) 
        endif



        ifeq ($(my_link_type),static)

            my_static_libraries += libm libc libdl

            my_static_libraries += libm libc

        endif

    endif

else ifeq ($(my_cxx_stl),ndk)