Fix crtso building with GCC

diff --git a/etc/mk/minix.ack.mk b/etc/mk/minix.ack.mk
index 1e5f310a1e3deaa708d6f0836a63f7f8332612f4..6f060aca18363851577de06cdef3ce7755507a59 100644 (file)
--- 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 e08d92fd8a659b3730379f0a9158fa60d3a64998..5d69cf02b39e04392e805d5cea0a72f098a10ee4 100644 (file)
--- 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