From 5dffed7dd1a413f3965af702fa7ecd79809d1988 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Tue, 8 Mar 2011 12:56:13 +0100
Subject: 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>
---
 Makerules | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Makerules')

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)
-- 
cgit v1.2.3