commit c0611b9594815de33dbf91de619047e5ea1dbdc0
author Ying Wang <wangying@google.com> Wed Feb 01 11:25:26 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 01 11:25:26 2012 -0800
tree 2240fe006f1639b64cb295e2338aa42d99ca6e94
parent d485a9d200f00b1b76290a90256110da6a654b46
parent b4c2a6404089805ca2bae0c82677115c240cbdd6

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

core/combo/HOST_darwin-x86.mk

diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index f5fd001..ca396eb 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -82,6 +82,12 @@
     $(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 @@
         $(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