From: Arun Thomas <arun@minix3.org>
Date: Wed, 24 Mar 2010 10:11:17 +0000 (+0000)
Subject: Fix crtso building with GCC
X-Git-Tag: v3.1.7~207
X-Git-Url: http://zhaoyanbai.com/repos/README?a=commitdiff_plain;h=0ea82663e0885477b6e48810c5b1fe6f4d5c629d;p=minix.git

Fix crtso building with GCC
---

diff --git a/etc/mk/minix.ack.mk b/etc/mk/minix.ack.mk
index 1e5f310a1..6f060aca1 100644
--- a/etc/mk/minix.ack.mk
+++ b/etc/mk/minix.ack.mk
@@ -9,7 +9,7 @@
 # .endif
 
 ASMCONV=gas2ack
-AFLAGS+=-D__ASSEMBLY__ -D_EM_WSIZE=4 -D__minix -I/usr/src/include -w -wo
+AFLAGS+=-D__ASSEMBLY__ -D_EM_WSIZE=4 -D__minix -w -wo
 CPP.s=${CC} -E ${AFLAGS}
 ASMCONVFLAGS+=-mi386
 
diff --git a/etc/mk/minix.gcc.mk b/etc/mk/minix.gcc.mk
index e08d92fd8..5d69cf02b 100644
--- a/etc/mk/minix.gcc.mk
+++ b/etc/mk/minix.gcc.mk
@@ -1,13 +1,2 @@
-.SUFFIXES:	.o .s
+AFLAGS+=-D__ASSEMBLY__ -D_EM_WSIZE=4 -D__minix
 
-ASMCONV=asmconv
-CPP.s=${CC} ${AFLAGS} -E -x assembler-with-cpp
-ASMCONVFLAGS+=-mi386 ack gnu
-
-# Need to convert ACK assembly files to GNU assembly before building
-.s.o:
-	${_MKTARGET_COMPILE}
-	${CPP.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.PREFIX}.ack.s
-	${ASMCONV} ${ASMCONVFLAGS} ${.PREFIX}.ack.s ${.PREFIX}.gnu.s
-	${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.PREFIX}.gnu.s -o ${.TARGET}
-	rm -rf ${.PREFIX}.ack.s ${.PREFIX}.gnu.s