From 12b24b0469747e04eb7f77bd43d8ef7fca2cbf21 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 17 Jul 2007 13:57:47 +0000
Subject: link init with stage1 libc (oh no, we are losing 6k!) since minilibc
 use removed _syscallX() macros (and I don't want to reinvent the wheel)

---
 mdk-stage1/Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'mdk-stage1')

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index a2019cb12..a1736a626 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -26,7 +26,7 @@ PRODUCT=drakx-installer-binaries
  # Currently:
  #
  # 	ix86
- # init with minilibc
+ # init with dietlibc
  # stage1 with dietlibc
  #
  # 	ppc
@@ -38,7 +38,7 @@ PRODUCT=drakx-installer-binaries
  # stage1 with glibc
  #
  #	x86-64
- # init with minilibc
+ # init with dietlibc
  # stage1 with dietlibc
  #
  #*****************************************************************************
@@ -58,15 +58,8 @@ DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)
 COMPILE = $(CC) $(DEFS) $(CFLAGS)
 
 INIT_DEFS =
-ifeq (DIETLIBC, $(L))
-INIT_DEFS += -DINIT_HEADERS=\"minilibc.h\"
-endif
-
-ifeq (DIETLIBC, $(L))
-INITSRC = minilibc.c init.c
-INIT_DEFS += -fno-builtin
-else
 INITSRC = init.c
+ifneq (DIETLIBC, $(L))
 INIT_DEFS += $(GLIBC_INCLUDES)
 endif
 
@@ -159,7 +152,7 @@ dirs:
 		[ "$$n" = "." ] || make -C $$n || exit 1 ;\
 	done
 
-init: $(INITOBJS)
+init: $(INITOBJS) $(STAGE1_LIBC)
 	$(DIET) $(CC) $(LDFLAGS) -o $@ $^
 	$(STRIPCMD) $@
 
-- 
cgit v1.2.1