summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2001-06-02 02:49:45 +0000
committerManuel Novoa III <mjn3@codepoet.org>2001-06-02 02:49:45 +0000
commit4f8c656e408ff31d081c8f1302cb7adff409ebb8 (patch)
tree747845744242a2d995941642152183ae631aff40
parenteb8bb5738da2748fcfcd9d32b04d9d08845213fb (diff)
Always check before you commit...^100. We need to build the dynamic linker
before we build shared libc. We need to build shared libc before libdl.
-rw-r--r--Makefile5
-rw-r--r--ldso/Makefile7
2 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c48a46181..0f5cde117 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,10 @@
TOPDIR=./
include Rules.mak
-DIRS = extra libc libcrypt libresolv libutil libm
+ifeq ($(LDSO_PRESENT), $(TARGET_ARCH))
+ LDSO_DIR = ldso
+endif
+DIRS = extra $(LDSO_DIR) libc libcrypt libresolv libutil libm
ifndef $(TARGET_PREFIX)
TARGET_PREFIX = `pwd`/_install
diff --git a/ldso/Makefile b/ldso/Makefile
index 8608bfd0c..9fb609c6d 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -1,9 +1,12 @@
TOPDIR=../
include Rules.mak
-SUBDIRS = util d-link libdl # man
+SUBDIRS = util libdl # d-link man
-all: shared
+all:
+ @if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \
+ $(MAKE) -C d-link; \
+ fi;
shared:
@if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \