diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-25 14:06:28 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-25 18:19:51 +0200 |
| commit | ea19e7243b3a4bd49cbad0cf03a5e9f50b2e3148 (patch) | |
| tree | 47818f28b2f7984d9d3af571f2567b2357324bf0 /solenv | |
| parent | 8fc420f4fa18a92eedd6bb7b34c8bc36ee2bac41 (diff) | |
No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 11 | ||||
| -rw-r--r-- | solenv/inc/unxandr.mk | 10 |
2 files changed, 20 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index cbcd3e64c5ba..53e571c72272 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -78,4 +78,15 @@ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ +# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so +# don't bother generating such. + +define gb_Library_get_rpath +endef + +define gb_Executable_get_rpath +endef + +gb_LinkTarget_LDFLAGS := $(subst -Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS)) + # vim: set noet sw=4: diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk index 49b481a0498d..9d172dffe767 100644 --- a/solenv/inc/unxandr.mk +++ b/solenv/inc/unxandr.mk @@ -52,5 +52,13 @@ STDSHLCUIMT+=-llog -landroid -lgnustl_shared # All shared libraries we build must start with "lib" because # otherwise the Android package installer will not unpack them from -# the .apk into the app's lib directory +# the .apk into the app's lib directory. ENFORCEDSHLPREFIX=lib + +# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so +# don't bother generating such. + +LINKFLAGSRUNPATH_URELIB= +LINKFLAGSRUNPATH_UREBIN= +LINKFLAGSRUNPATH_OOO= +LINKFLAGSRUNPATH_SDK= |