summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-12 17:38:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-12 17:38:11 +0000
commit92ae1e8e294770b665e538fd09c2e69611b151db (patch)
tree02172289283e884beaec169e647fa8d36ba3bf9e /mdk-stage1
parentee09a3494a73cac2605fd30bae546f7bbd1662d7 (diff)
downloaddrakx-92ae1e8e294770b665e538fd09c2e69611b151db.tar
drakx-92ae1e8e294770b665e538fd09c2e69611b151db.tar.gz
drakx-92ae1e8e294770b665e538fd09c2e69611b151db.tar.bz2
drakx-92ae1e8e294770b665e538fd09c2e69611b151db.tar.xz
drakx-92ae1e8e294770b665e538fd09c2e69611b151db.zip
simplify arch dependent config based on dietlibc vs glibc.
this patch may be wrong for ppc which now used dietlibc but may prefer init-libc-headers.h over minilibc.h (need testing)
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/Makefile23
1 files changed, 5 insertions, 18 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index ed46192ad..ef47696fc 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -53,21 +53,12 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS)
#- stage1 "loader"
-ifeq (i386, $(ARCH))
-INITSRC = minilibc.c init.c
-INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" -fno-builtin
-else
-ifeq (x86_64, $(ARCH))
+ifeq (DIETLIBC, $(L))
INITSRC = minilibc.c init.c
INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" -fno-builtin
else
INITSRC = init.c
-ifeq (ia64, $(ARCH))
INIT_DEFS = -DINIT_HEADERS=\"init-libc-headers.h\" $(GLIBC_INCLUDES)
-else
-INIT_DEFS = -DINIT_HEADERS=\"init-libc-headers.h\" $(DIETLIBC_INCLUDES)
-endif
-endif
endif
INIT_DEFS_ADD = -DBINARY=\"/sbin/stage1\"
@@ -94,12 +85,10 @@ FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC))
FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS)
-INSMOD = insmod-modutils
-ifeq (i386, $(ARCH))
-INSMOD = insmod-busybox
-endif
-ifeq (x86_64, $(ARCH))
+ifeq (DIETLIBC, $(L))
INSMOD = insmod-busybox
+else
+INSMOD = insmod-modutils
endif
STAGE1_OWN_LIBS = $(INSMOD)/libinsmod.a mar/libmar.a bzlib/libbzlib.a
@@ -107,9 +96,7 @@ STAGE1_OWN_LIBS = $(INSMOD)/libinsmod.a mar/libmar.a bzlib/libbzlib.a
ifeq (DIETLIBC, $(L))
STAGE1_NETWORK_LIBS = $(top_dir)/dietlibc/bin-$(ARCH)/librpc.a
-endif
-
-ifeq (GLIBC, $(L))
+else
ifeq (x86_64, $(ARCH))
STAGE1_NETWORK_LIBS = /usr/lib64/libresolv.a
else