Explorar el Código

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>
Peter S. Mazinger hace 14 años
padre
commit
5dffed7dd1
Se han modificado 1 ficheros con 6 adiciones y 0 borrados
  1. 6 0
      Makerules

+ 6 - 0
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)