From 9b3e7a42c7f10fcb433ca70a7cfab995162e62e1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 12 Nov 2004 17:53:45 +0000
Subject: drop unused INIT_LIBC, GLIBC_LIBC, DIETLIBC_LIBC (all 3 were empty at
 the moment)

---
 mdk-stage1/Makefile        | 11 ++++-------
 mdk-stage1/Makefile.common |  5 -----
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'mdk-stage1')

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index ce928abed..d370aab4a 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -108,7 +108,7 @@ ifeq (DIETLIBC, $(L))
 STAGE1_NETWORK_LIBS = $(top_dir)/dietlibc/bin-$(ARCH)/librpc.a
 else
 ifeq (x86_64, $(ARCH))
-STAGE1_NETWORK_LIBS = /usr/lib64/libresolv.a
+STAGE1_NETWORK_LIBS = /usr/$(LIB)/libresolv.a
 else
 STAGE1_NETWORK_LIBS = /usr/lib/libresolv.a
 endif
@@ -143,15 +143,12 @@ ifeq (i386, $(ARCH))
 LDFLAGS_INIT = -static -nostdlib /usr/lib/crt1.o
 else
 ifeq (x86_64, $(ARCH))
-LDFLAGS_INIT = -static -nostdlib /usr/lib64/crt1.o
-INIT_LIBC = $(GLIBC_LIBC)
+LDFLAGS_INIT = -static -nostdlib /usr/$(LIB)/crt1.o
 else
 ifeq (ia64, $(ARCH))
 LDFLAGS_INIT = $(GLIBC_LDFLAGS_STAGE1)
-INIT_LIBC = $(GLIBC_LIBC)
 else
 LDFLAGS_INIT = $(DIETLIBC_LDFLAGS_STAGE1)
-INIT_LIBC = $(DIETLIBC_LIBC)
 endif
 endif
 endif
@@ -198,11 +195,11 @@ dirs:
 		[ "$$n" = "." ] || make -C $$n || exit 1 ;\
 	done
 
-init: $(INITOBJS) $(INIT_LIBC)
+init: $(INITOBJS)
 	$(CC) $(LDFLAGS_INIT) -o $@ $^
 	$(STRIPCMD) $@
 
-init-stage2: $(INITOBJS-STAGE2) $(INIT_LIBC)
+init-stage2: $(INITOBJS-STAGE2)
 	$(CC) $(LDFLAGS_INIT) -o $@ $^
 	$(STRIPCMD) $@
 
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common
index ec7066a06..56494bb5e 100644
--- a/mdk-stage1/Makefile.common
+++ b/mdk-stage1/Makefile.common
@@ -29,9 +29,6 @@ F = NEWT
 ifeq (ia64, $(ARCH))
 L = GLIBC
 endif
-ifeq (ppc, $(ARCH))
-L = GLIBC
-endif
 ifeq (x86_64, $(ARCH))
 #L = GLIBC
 endif
@@ -56,8 +53,6 @@ GLIBC_LDFLAGS_STAGE1 = -static
 DIETLIBC_LDFLAGS_STAGE1 = -nostdlib
 LDFLAGS_STAGE1 = $($(L)_LDFLAGS_STAGE1)
 
-GLIBC_LIBC =
-DIETLIBC_LIBC = 
 STAGE1_LIBC = $($(L)_LIBC)
 
 STRIPCMD = strip -R .note -R .comment
-- 
cgit v1.2.1