Fix GCC image building

2011-07-09 15:04:42 +02:00
parent a97a80178e
commit b956c8735e
42 changed files with 64 additions and 57 deletions
@@ -1,4 +1,4 @@
-.if (${NBSD_LIBC} != "no")
+.if ${COMPILER_TYPE} == "gnu"
 CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
 LDADD+= -lminlib -lcompat_minix
 DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
@@ -9,4 +9,4 @@ BINDIR?= /sbin
 INSTALLFLAGS+=	-S 128k

 MAN=
-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -16,4 +16,4 @@ INSTALLFLAGS+= -S 128k
 DEFAULT_NR_BUFS= 1024
 CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -11,4 +11,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -21,4 +21,4 @@ BINDIR?= /usr/sbin

 CPPFLAGS+=  -I${.CURDIR} -D_MINIX

-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -1,4 +1,6 @@
 # Makefile for the init program (INIT)
+.include <bsd.own.mk>
+
 PROG=	init
 SRCS=	init.c

@@ -7,4 +9,8 @@ MAN=
 BINDIR?= /usr/sbin
 INSTALLFLAGS+=	-S 64k

-.include <minix.bootprog.mk>
+.if ${OBJECT_FMT} == "ELF"
+LDFLAGS+= -Wl,--section-start=.init=0x0
+.endif
+
+.include <bsd.prog.mk>
@@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -13,4 +13,4 @@ CPPFLAGS.dmp_kernel.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.dmp_rs.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.dmp_vm.c+=	-I${MINIXSRCDIR}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -13,4 +13,4 @@ BINDIR?= /sbin
 NR_BUFS= 100
 CPPFLAGS+= -DNR_BUFS=${NR_BUFS}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -23,4 +23,4 @@ CPPFLAGS+= -I${.CURDIR}/../../lib/liblwip/include

 CFLAGS += -Wextra -std=c99

-.include <bsd.prog.mk>
+.include <minix.service.mk>
@@ -11,4 +11,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>