diff options
| author | Ying Wang <wangying@google.com> | 2015-06-01 10:43:29 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-06-01 10:43:29 -0700 |
| commit | 4fe7bfd373d99dedfd2e63135da5189478bb0138 (patch) | |
| tree | bdd9ae9f675f31c671828914573941ad0fe5dc99 /core/combo | |
| parent | ad2494bb79932c4f2fd55f51e9b0d58676502558 (diff) | |
| download | build-4fe7bfd373d99dedfd2e63135da5189478bb0138.zip build-4fe7bfd373d99dedfd2e63135da5189478bb0138.tar.gz build-4fe7bfd373d99dedfd2e63135da5189478bb0138.tar.bz2 | |
Add $ORIGIN/lib[64] to host binary's rpath.
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the exsiting SDK
directory structure.
Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 8389bb8..e77fd21 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -78,12 +78,14 @@ $(hide) $(PRIVATE_CXX) \ -o $@ \ -install_name @rpath/$(notdir $@) \ -Wl,-rpath,@loader_path/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \ + -Wl,-rpath,@loader_path/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \ $(PRIVATE_LDFLAGS) endef define transform-host-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ -Wl,-rpath,@loader_path/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \ + -Wl,-rpath,@loader_path/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \ -o $@ \ -Wl,-headerpad_max_install_names \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \ |