summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-12-20 11:40:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-20 11:40:33 -0800
commit098826bf61cba2b14a0538100878bdb029f50790 (patch)
treee52436fb3fa57148448057b308820fb87a73dc66
parent28599d022e80651c2f21274d6055b03f4154d3e1 (diff)
parent099fecd759ce54168fe4094880d1ca748e8906b9 (diff)
downloadbuild-098826bf61cba2b14a0538100878bdb029f50790.zip
build-098826bf61cba2b14a0538100878bdb029f50790.tar.gz
build-098826bf61cba2b14a0538100878bdb029f50790.tar.bz2
am 099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '099fecd759ce54168fe4094880d1ca748e8906b9': Use PRIVATE_CXX in HOST modules.
-rw-r--r--core/definitions.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/definitions.mk b/core/definitions.mk
index 91024f2..ca8bc67 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1001,7 +1001,7 @@ endef
# it to be overriden en-masse see combo/linux-arm.make for an example.
ifneq ($(HOST_CUSTOM_LD_COMMAND),true)
define transform-host-o-to-shared-lib-inner
-$(HOST_CXX) \
+$(PRIVATE_CXX) \
-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \
-Wl,-rpath,\$$ORIGIN/../lib \
-shared -Wl,-soname,$(notdir $@) \
@@ -1161,7 +1161,7 @@ endef
ifneq ($(HOST_CUSTOM_LD_COMMAND),true)
define transform-host-o-to-executable-inner
-$(HOST_CXX) \
+$(PRIVATE_CXX) \
-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \
-Wl,-rpath,\$$ORIGIN/../lib \
$(HOST_GLOBAL_LD_DIRS) \