From 34d61933bb059372c68a4cfacc4ce801dc1f28db Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 15 Jun 2001 23:58:10 +0000
Subject: A few build updates

---
 Makefile           | 6 ++----
 Rules.mak          | 4 ++--
 ldso/Makefile      | 2 +-
 ldso/util/Makefile | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 505d964b9..4c95a4830 100644
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,7 @@
 TOPDIR=./
 include Rules.mak
 
-ifeq ($(DO_SHARED),shared)
-    LDSO_DIR = ldso
-endif
-DIRS = extra $(LDSO_DIR) libc libcrypt libresolv libutil libm  
+DIRS = extra ldso libc libcrypt libresolv libutil libm  
 
 ifndef $(TARGET_PREFIX)
 	TARGET_PREFIX = `pwd`/_install
@@ -50,6 +47,7 @@ Config:
 
 shared:
 	@$(MAKE) -C libc shared
+	@$(MAKE) -C ldso/util
 ifeq ($(LDSO_PRESENT), $(TARGET_ARCH))
 	@$(MAKE) -C ldso shared
 endif
diff --git a/Rules.mak b/Rules.mak
index ba14a2743..4d9c8660d 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -56,13 +56,13 @@ ifeq ($(strip $(DODEBUG)),true)
     CFLAGS += -g
     TARGET_CFLAGS += -g
     LDFLAGS = -nostdlib -Wl,-warn-common 
-    TARGET_LDFLAGS = -Wl,-warn-common
+    TARGET_LDFLAGS = --uclibc-use-build-dir -Wl,-warn-common
     STRIPTOOL = /bin/true -Since_we_are_debugging
 else
     CFLAGS  += -DNDEBUG #-fomit-frame-pointer
     TARGET_CFLAGS += -DNDEBUG #-fomit-frame-pointer
     LDFLAGS  = -s -nostdlib -Wl,-warn-common
-    TARGET_LDFLAGS = -s -Wl,-warn-common
+    TARGET_LDFLAGS = --uclibc-use-build-dir -s -Wl,-warn-common
 endif
 
 ifndef $(PREFIX)
diff --git a/ldso/Makefile b/ldso/Makefile
index f26489eee..aa37d2ea4 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -1,7 +1,7 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
-SUBDIRS = util libdl
+SUBDIRS = libdl
 ALL_SUBDIRS = util libdl d-link
 
 all:
diff --git a/ldso/util/Makefile b/ldso/util/Makefile
index cb5cfea34..dd69c9b10 100644
--- a/ldso/util/Makefile
+++ b/ldso/util/Makefile
@@ -17,13 +17,13 @@ ldd.o: ldd.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 readelf: readelf.c
-	$(TARGET_CC) $(TARGET_CFLAGS) readelf.c -o $@
+	$(TARGET_CC) $(TARGET_CFLAGS) -static readelf.c -o $@
 
 ldconfig: ldconfig.o readsoname.o
 	$(TARGET_CC) $(TARGET_CFLAGS) -static $^ -o $@
 
 ldd:	ldd.o readsoname.o
-	$(TARGET_CC) $(TARGET_CFLAGS) $^ -o $@
+	$(TARGET_CC) $(TARGET_CFLAGS) -static $^ -o $@
 
 clean:
 	rm -f ldconfig ldd readelf *.o *~ core
-- 
cgit v1.2.3