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

Commit 611211ac authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" 

am: ac7a7bb0

* commit 'ac7a7bb0':
  Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS

Change-Id: I7e880084b72d90dc4de16fd674692b53b1e67de2
parents f85807f7 ac7a7bb0

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ endif 
# up if --no-undefined is passed to the linker.

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

ifeq ($(my_allow_undefined_symbols),)

  my_ldflags +=  $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)NO_UNDEFINED_LDFLAGS)

  my_ldflags += -Wl,--no-undefined

endif

endif

core/combo/HOST_darwin-x86.mk

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx 
$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)



$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -fPIC -funwind-tables

$(combo_2nd_arch_prefix)HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error



$(combo_2nd_arch_prefix)HOST_SHLIB_SUFFIX := .dylib

$(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib

core/combo/HOST_darwin-x86_64.mk

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_v 
HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)



HOST_GLOBAL_CFLAGS += -fPIC -funwind-tables

HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error



HOST_SHLIB_SUFFIX := .dylib

HOST_JNILIB_SUFFIX := .jnilib

core/combo/HOST_linux-x86.mk

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CO 
# both 32- and 64-bit (whether art uses them or not --- 9d59f417767991246848c3e101cb27d2dfea5988).

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1



$(combo_2nd_arch_prefix)HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined



############################################################

## Macros after this line are shared by the 64-bit config.

core/combo/HOST_linux-x86_64.mk

+0 −2
Original line number Diff line number Diff line
@@ -40,5 +40,3 @@ HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector 
# Workaround differences in inttypes.h between host and target.

# See bug 12708004.

HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
 


HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined