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

Commit a82fa12c authored by Colin Cross's avatar Colin Cross
Browse files

Don't pass -Wl,--no-undefined to host targets 

Host builds were compiling without -Wl,--no-undefined because of an ASAN
issue.  Pass -Wl,--no-undefined for host builds unless sanitzers are
enabled.  Also fix LOCAL_ALLOW_UNDEFINED_SYMBOLS on darwin, where
disallowing undefined symbols is the default.

Test: m -j host
Test: m -j SANITIZE_HOST=address host
Bug: 32305815
Change-Id: I0344c321610c55eb8b2092b01e50e4a93a0e85df
parent e56e356c

core/binary.mk

+15 −5
Original line number Diff line number Diff line
@@ -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 :=
@@ -626,8 +627,17 @@ endif 
# up if --no-undefined is passed to the linker.

ifeq ($(strip $(LOCAL_NO_DEFAULT_COMPILER_FLAGS)),)

  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))