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

Commit 9fb35266 authored by Ying Wang's avatar Ying Wang
Browse files

Make -rpath-link work with multilib. 

Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783
parent b3bc6136

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

core/combo/TARGET_linux-arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-Wl,-dynamic-linker,/system/bin/linker64 \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

core/combo/TARGET_linux-mips.mk

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

core/combo/TARGET_linux-mips64.mk

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

core/combo/TARGET_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ $(hide) $(PRIVATE_CXX) \ 
	-Wl,-z,nocopyreloc \

	-fPIE -pie \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \