OSDN Git Service

Makerules: respect HARDWIRED_ABSPATH in interp.c
authorPeter S. Mazinger <ps.m@gmx.net>
Tue, 8 Mar 2011 11:56:13 +0000 (12:56 +0100)
committerPeter S. Mazinger <ps.m@gmx.net>
Tue, 8 Mar 2011 11:56:13 +0000 (12:56 +0100)
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

index 3a4d566..f045e52 100644 (file)
--- 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)