diff options
| author | Ying Wang <wangying@google.com> | 2014-02-22 00:58:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-22 00:58:46 +0000 |
| commit | d4fe0bdfcb633611501408a0e0bd61870eae10b3 (patch) | |
| tree | f7a7d89146a96a48d84edff61b8766b4c5eb1f8e /core/combo/TARGET_linux-arm.mk | |
| parent | 25c67db7d28dc91b77f0670b500841f079077af7 (diff) | |
| parent | 9b996f80a95f48bae153c35bacc0360c004e5258 (diff) | |
| download | build-d4fe0bdfcb633611501408a0e0bd61870eae10b3.zip build-d4fe0bdfcb633611501408a0e0bd61870eae10b3.tar.gz build-d4fe0bdfcb633611501408a0e0bd61870eae10b3.tar.bz2 | |
am 9b996f80: am eb9b62e0: Merge "Make -rpath-link work with multilib."
* commit '9b996f80a95f48bae153c35bacc0360c004e5258':
Make -rpath-link work with multilib.
Diffstat (limited to 'core/combo/TARGET_linux-arm.mk')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 7e733d8..da1b70a 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -250,7 +250,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ -Wl,--gc-sections \ -Wl,-z,nocopyreloc \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ + -Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ |