[git commit prelink] Makerules: respect HARDWIRED_ABSPATH in interp.c
Peter S. Mazinger
ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=5dffed7dd1a413f3965af702fa7ecd79809d1988
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink
Build LDSO path according to the HARDWIRED_ABSPATH setting
While there, remove duplicated slashes in interp.c
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
Makerules | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Makerules b/Makerules
index 3a4d566..f045e52 100644
--- a/Makerules
+++ b/Makerules
@@ -364,8 +364,14 @@ $(top_builddir)%.dep:
$(top_builddir)lib/interp.c: | $(top_builddir)lib
$(Q)echo "/* Force shared libraries to know about the correct library loader */" > $@.tmp
$(Q)echo "#include <features.h>" >> $@.tmp
+ifeq ($(HARDWIRED_ABSPATH),y)
$(Q)echo "const char __dl_ldso__[] attribute_hidden __attribute__ ((weak)) __attribute__ ((section " \
"(\".interp\"))) =\""$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UCLIBC_LDSO)"\";" >> $@.tmp
+ $(Q)$(SED) -i -e 's://:/:g' $@.tmp
+else
+ $(Q)echo "const char __dl_ldso__[] attribute_hidden __attribute__ ((weak)) __attribute__ ((section " \
+ "(\".interp\"))) =\""$(UCLIBC_LDSO)"\";" >> $@.tmp
+endif
$(Q)mv $@.tmp $@
$(interp): $(top_builddir)lib/interp.c | $(sub_headers)
--
1.7.3.4
More information about the uClibc-cvs
mailing list