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

Commit 4fe7bfd3 authored by Ying Wang's avatar Ying Wang
Browse files

Add $ORIGIN/lib[64] to host binary's rpath. 

Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the exsiting SDK
directory structure.

Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
parent ad2494bb

core/combo/HOST_darwin-x86.mk

+2 −0
Original line number Diff line number Diff line
@@ -78,12 +78,14 @@ $(hide) $(PRIVATE_CXX) \ 
        -o $@ \

        -install_name @rpath/$(notdir $@) \

        -Wl,-rpath,@loader_path/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

        -Wl,-rpath,@loader_path/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

        $(PRIVATE_LDFLAGS)

endef



define transform-host-o-to-executable-inner

$(hide) $(PRIVATE_CXX) \

        -Wl,-rpath,@loader_path/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

        -Wl,-rpath,@loader_path/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

        -o $@ \

        -Wl,-headerpad_max_install_names \

        $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \

core/definitions.mk

+2 −0
Original line number Diff line number Diff line
@@ -1394,6 +1394,7 @@ define transform-host-o-to-shared-lib-inner 
$(hide) $(PRIVATE_CXX) \

	-Wl,-rpath-link=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath,\$$ORIGIN/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

	-Wl,-rpath,\$$ORIGIN/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

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

	$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
@@ -1610,6 +1611,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-Wl,-rpath-link=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath,\$$ORIGIN/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

	-Wl,-rpath,\$$ORIGIN/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

	$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

		$(PRIVATE_HOST_GLOBAL_LDFLAGS) \