commit 9fb3526648a08d8d8c1e6325aeb3c6500bcd44c2
author Ying Wang <wangying@google.com> Fri Feb 21 16:17:05 2014 -0800
committer Ying Wang <wangying@google.com> Fri Feb 21 16:20:20 2014 -0800
tree dd9df8fb9098a428c30478bc9e561cda9d8acacd
parent b3bc61365bb71cc45d10c22762aa86a3b78f1329

Make -rpath-link work with multilib.

Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 0ba0f75..6c65bc5 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1290,7 +1290,7 @@
 define transform-o-to-shared-lib-inner
 $(hide) $(PRIVATE_CXX) \
 	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
-	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \
+	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \
 	-Wl,-rpath,\$$ORIGIN/../lib \
 	-shared -Wl,-soname,$(notdir $@) \
 	$(PRIVATE_LDFLAGS) \
@@ -1335,7 +1335,7 @@
 $(hide) $(PRIVATE_CXX) \
 	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
 	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
-	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \
+	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \
 	-Wl,-rpath,\$$ORIGIN/../lib \
 	$(PRIVATE_LDFLAGS) \
 	$(PRIVATE_ALL_OBJECTS) \