Explorar el Código

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.

Manuel Novoa III hace 23 años
padre
commit
4f8c656e40
Se han modificado 2 ficheros con 9 adiciones y 3 borrados
  1. 4 1
      Makefile
  2. 5 2
      ldso/Makefile

+ 4 - 1
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

+ 5 - 2
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 \