From 91307a366625e3ec7e618f012269130d2e5bba57 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 4 May 2001 22:29:43 +0000
Subject: This patch allows powerpc to compile again.  It also checks if we are
 compiling for an arch for which uClibc has an ld.so or not, and otherwise
 sets things up to use the system ld.so.  -Erik

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 667c961d8..82aa64ab3 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@
 #
 #--------------------------------------------------------
 
+TOPDIR=./
 include Rules.mak
 
 DIRS = extra misc pwd_grp stdio string termios inet signal stdlib sysdeps unistd crypt
@@ -42,23 +43,24 @@ $(LIBNAME): subdirs
 shared: $(LIBNAME)
 	@rm -rf tmp
 	@mkdir tmp
-	@$(MAKE) -C ld.so-1/d-link
+	@$(MAKE) -C ld.so-1 d-link
 	@(cd tmp; CC=$(CC) /bin/sh ../extra/scripts/get-needed-libgcc-objects.sh)
 	if [ -s ./tmp/libgcc-need.a ] ; then \
 		$(CC) -g $(LDFLAGS) -shared -o $(SHARED_FULLNAME) \
 		    -Wl,-soname,$(SHARED_MAJORNAME) -Wl,--whole-archive \
 		    ./$(LIBNAME) ./tmp/libgcc-need.a \
-		    ld.so-1/d-link/ld-linux-uclibc.so.0; \
+		    $(LDSO) ; \
 	else \
 		$(CC) -g $(LDFLAGS) -shared -o $(SHARED_FULLNAME) \
 		    -Wl,-soname,$(SHARED_MAJORNAME) -Wl,--whole-archive \
-		    ./$(LIBNAME) ld.so-1/d-link/ld-linux-uclibc.so.0; \
+		    ./$(LIBNAME) $(LDSO) ; \
 	fi
 	@rm -rf tmp
 	ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME)
 	ln -sf $(SHARED_MAJORNAME) libc.so
 	@$(MAKE) -C crypt shared
 	@$(MAKE) -C ld.so-1
+	echo "Using $(LDSO) for the shared library loader"
 
 done: $(LIBNAME) $(DO_SHARED)
 	@echo
-- 
cgit v1.2.3