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

Commit c0611b95 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Set install name with absolute path for Mac host shared libraries."

parents d485a9d2 b4c2a640

core/combo/HOST_darwin-x86.mk

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ $(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \ 
    $(call _darwin-extract-and-include-single-whole-static-lib, $(lib)))

endef



ifeq (,$(filter /%,$(HOST_OUT_SHARED_LIBRARIES)))

ABP_HOST_OUT_SHARED_LIBRARIES := $(shell pwd)/$(HOST_OUT_SHARED_LIBRARIES)

else

ABP_HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT_SHARED_LIBRARIES)

endif



define transform-host-o-to-shared-lib-inner

$(call darwin-extract-and-include-whole-static-libs)

$(hide) $(PRIVATE_CXX) \
@@ -96,6 +102,7 @@ $(hide) $(PRIVATE_CXX) \ 
        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

        $(PRIVATE_LDLIBS) \

        -o $@ \

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

        $(PRIVATE_LDFLAGS) \

        $(HOST_LIBGCC)

endef