diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-02-21 23:01:11 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-02-21 23:01:11 +0000 |
| commit | 841067b45e61bb8d5a1394d8bba25db1d2a23ea0 (patch) | |
| tree | 76a8779a4825eef4fa8655ece532a1e34b601615 /mdk-stage1/Makefile | |
| parent | 4fc11a304d40052e9515f660e144d925eff8575c (diff) | |
| download | drakx-backup-do-not-use-841067b45e61bb8d5a1394d8bba25db1d2a23ea0.tar drakx-backup-do-not-use-841067b45e61bb8d5a1394d8bba25db1d2a23ea0.tar.gz drakx-backup-do-not-use-841067b45e61bb8d5a1394d8bba25db1d2a23ea0.tar.bz2 drakx-backup-do-not-use-841067b45e61bb8d5a1394d8bba25db1d2a23ea0.tar.xz drakx-backup-do-not-use-841067b45e61bb8d5a1394d8bba25db1d2a23ea0.zip | |
- fix "init" on ppc (do not use minilibc on non-i386 arch's)
- fix segfault of dietlibc-linked apps (broken va_stuff in dietlibc)
- cleanup of "init"
Diffstat (limited to 'mdk-stage1/Makefile')
| -rw-r--r-- | mdk-stage1/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index ce75a7c5f..5c3a0e98a 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -37,7 +37,13 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS) #- stage1 "loader" +ifeq (i386, $(ARCH)) INITSRC = minilibc.c init.c +INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" +else +INITSRC = init.c +INIT_DEFS = -DINIT_HEADERS=\"init-libc-headers.h\" +endif INITOBJS = $(subst .c,.o,$(INITSRC)) @@ -103,13 +109,9 @@ NETWORK_DEFS = -DDISABLE_CDROM -DDISABLE_DISK ifeq (i386, $(ARCH)) -MINILIC=minilibc.o LDFLAGS_INIT = -static -nostdlib /usr/lib/crt1.o -endif -ifeq (sparc, $(ARCH)) -MINILIBC=minilibc.o /usr/lib/libc.a -LDFLAGS_INIT = -static -nostdlib /usr/lib/crt1.o -LDFLAGS_STAGE1 = -static +else +LDFLAGS_INIT = $(GLIBC_LDFLAGS_STAGE1) endif @@ -165,6 +167,9 @@ $(STAGE1OBJS-DISK): %-DISK.o: %.c .depend $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c .depend $(COMPILE) $(GLIBC_INCLUDES) $(NETWORK_DEFS) -c $< -o $@ +$(INITOBJS): %.o: %.c + $(COMPILE) $(INIT_DEFS) $(GLIBC_INCLUDES) -c $< + .c.o: .depend $(COMPILE) $(GLIBC_INCLUDES) $(PCMCIA_DEFS) -c $< |