[git commit future 1/1] Makerules: hardcode absolute path into .interp section

Khem Raj raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=1ee4b98476a83d5f139e863d6f71a9356a046edd
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Reverted partly an earlier commit, keeping only the stripping
of multiple /.

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 Makerules |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/Makerules b/Makerules
index f045e52..d5b28ea 100644
--- a/Makerules
+++ b/Makerules
@@ -364,14 +364,9 @@ $(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