summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-08 12:56:13 +0100
committerPeter S. Mazinger <ps.m@gmx.net>2011-03-08 12:56:13 +0100
commit5dffed7dd1a413f3965af702fa7ecd79809d1988 (patch)
tree46aa9c9aaacbdbe40e6d2356da18cc3951901ba2
parent2ea26d2c32507f11733a0d62e5723de26ea464ba (diff)
Makerules: respect HARDWIRED_ABSPATH in interp.c
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@gmx.net>
-rw-r--r--Makerules6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makerules b/Makerules
index 3a4d566d4..f045e527f 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)