diff options
| author | Matthias Badaire <mbadaire@mandriva.com> | 2001-05-30 14:31:23 +0000 |
|---|---|---|
| committer | Matthias Badaire <mbadaire@mandriva.com> | 2001-05-30 14:31:23 +0000 |
| commit | 0879c2dadfe9f6998bdcddf837918ed8617d17b4 (patch) | |
| tree | 29d89b91ab9935e390efcf1739a7867b8ea2d8c3 /mdk-stage1/Makefile | |
| parent | d8b95b8592b512c3bc036cb2df9745e39104490d (diff) | |
| download | drakx-backup-do-not-use-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar drakx-backup-do-not-use-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar.gz drakx-backup-do-not-use-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar.bz2 drakx-backup-do-not-use-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar.xz drakx-backup-do-not-use-0879c2dadfe9f6998bdcddf837918ed8617d17b4.zip | |
- allow build on ia64
- have CFLAGS centralized in Makefile.common (should help ports such as alpha)
- better looking sub makefiles
Diffstat (limited to 'mdk-stage1/Makefile')
| -rw-r--r-- | mdk-stage1/Makefile | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 75857a408..7f43acf06 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -18,6 +18,23 @@ # Portions from Erik Troan (ewt@redhat.com) Copyright 1996 Red Hat Software # #***************************************************************************** + # + # Currently: + # + # ix86 + # init with minilibc + # stage1 with dietlibc except some targets + # + # ppc + # init with dietlibc + # stage1 with glibc + # + # ia64 + # init with glibc + # stage1 with glibc + # + #***************************************************************************** + VERSION = cooker @@ -26,8 +43,6 @@ top_dir = . include $(top_dir)/Makefile.common -CFLAGS = -Os -pipe -Wall -Werror -fomit-frame-pointer - DEFS = -DVERSION=\"$(VERSION)\" -DSPAWN_SHELL COMPILE = $(CC) $(DEFS) $(CFLAGS) @@ -39,8 +54,12 @@ INITSRC = minilibc.c init.c INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" 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 INITOBJS = $(subst .c,.o,$(INITSRC)) @@ -108,9 +127,14 @@ NETWORK_DEFS = -DDISABLE_CDROM -DDISABLE_DISK ifeq (i386, $(ARCH)) 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 BINS = init stage1-full @@ -119,8 +143,10 @@ ifeq (i386, $(ARCH)) BINS += stage1-cdrom stage1-disk stage1-network endif - -DIRS = dietlibc mar pci-resource bzlib $(INSMOD) slang newt +ifneq (ia64, $(ARCH)) +DIRS = dietlibc +endif +DIRS += mar pci-resource bzlib $(INSMOD) slang newt ifeq (i386,$(ARCH)) DIRS += pcmcia endif |