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

Commit f6ac794d authored by Dan Albert's avatar Dan Albert Committed by Android (Google) Code Review
Browse files

Merge "Inhibit implicit -Bsymolic in -shared." into lmp-dev

parents 8311d57e 04cf3159

core/binary.mk

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ ifneq ($(LOCAL_NO_SYNTAX_CHECK),true) 
endif

endif

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(my_cxx)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLANG := $(my_clang)



# TODO: support a mix of standard extensions so that this isn't necessary

LOCAL_CPP_EXTENSION := $(strip $(LOCAL_CPP_EXTENSION))

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner 
$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	-shared \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \

core/combo/TARGET_linux-arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ define transform-o-to-shared-lib-inner 
$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	-shared \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \

core/combo/TARGET_linux-mips.mk

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner 
$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	-shared \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \

core/combo/TARGET_linux-mips64.mk

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ define transform-o-to-shared-lib-inner 
$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	-shared \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \