${LIBGCC} is useless, since libgcc.a does not live in /usr/lib; instead,

use gcc to get the correct location.

4 files changed, 15 insertions, 13 deletions

diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index 693a192ed57..32a38df5c5a 100644
--- a/sys/arch/mvme88k/stand/bootsd/Makefile
+++ b/sys/arch/mvme88k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.7 2001/01/13 05:19:00 smurph Exp $
+#	$OpenBSD: Makefile,v 1.8 2003/08/01 07:42:31 miod Exp $
 
       
 S=	${.CURDIR}/../../../..
@@ -17,7 +17,7 @@ CLEANFILES+=bootsd
 
 SRCS=   boot.c conf.c version.c
 
-LIBS=	${LIBSA} ${LIBBUG} ${LIBZ} ${LIBGCC}
+LIBS=	${LIBSA} ${LIBBUG} ${LIBZ}
 
 OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 
@@ -28,7 +28,7 @@ all: ${ALL}
 
 bootsd: ${OBJS} ${STAGE2} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${STAGE2} ${OBJS} ${LIBS}
+		${STAGE2} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index 82f0a38f81a..f9aa1c064a5 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.7 2001/01/13 05:19:00 smurph Exp $
+#	$OpenBSD: Makefile,v 1.8 2003/08/01 07:42:32 miod Exp $
 
 SIZE?=	size
 
@@ -19,7 +19,7 @@ CLEANFILES+=stboot bootst bootst.bug
 
 SRCS=   boot.c conf.c dev_tape.c rawfs.c version.c
 
-LIBS=	${LIBSA} ${LIBBUG} ${LIBZ} 
+LIBS=	${LIBSA} ${LIBBUG} ${LIBZ}
 
 OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 
@@ -29,7 +29,8 @@ ALL=	${BOOTS}
 all: ${ALL}
 
 bootst.bug:	${OBJS} ${SINGLE} ${LIBS}
-	${LD} ${LDFLAGS} ${SINGLE} ${OBJS} ${LIBS} -o $@
+	${LD} ${LDFLAGS} ${SINGLE} -o $@ \
+	    ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 	@${SIZE} bootst.bug
 
 bootst stboot: bootst.bug ${WRTVID}
diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index 70d139447f2..28530e986b6 100644
--- a/sys/arch/mvme88k/stand/bootxx/Makefile
+++ b/sys/arch/mvme88k/stand/bootxx/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.6 2001/01/13 05:19:01 smurph Exp $
+#	$OpenBSD: Makefile,v 1.7 2003/08/01 07:42:33 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC} 
@@ -15,7 +15,7 @@ CLEANFILES+=bootxx
 
 SRCS=   bootxx.c conf.c version.c
 
-LIBS=	${LIBSA} ${LIBBUG} ${LIBZ} ${LIBGCC}
+LIBS=	${LIBSA} ${LIBBUG} ${LIBZ}
 
 OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 
@@ -25,7 +25,8 @@ ALL=	${BOOTS}
 all: ${ALL}
 
 bootxx: ${OBJS} ${STAGE1} ${LIBS}
-	${LD} -N -T ${STAGE1_RELOC} ${STAGE1} ${OBJS} ${LIBS} -o $@
+	${LD} -N -T ${STAGE1_RELOC} ${STAGE1} -o $@ \
+	    ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 482e6f54d95..4a524c5e5e4 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2003/04/10 22:42:29 millert Exp $
+#	$OpenBSD: Makefile,v 1.10 2003/08/01 07:42:33 miod Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -20,15 +20,15 @@ SRCS=   boot.c conf.c version.c devopen.c dev_net.c
 SRCS+=	if_ie.c 
 #SRCS+=  if_le.c
 OBJS=  ${SRCS:S/.c/.o/g}
-LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} ${LIBGCC}
+LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
 LDFLAGS+= -s -N -T ${STAGE2_RELOC} 
 #LDFLAGS+= -nostdlib -s -N -Ttext ${RELOC}
 
 all:	netboot.bin
 
 netboot: ${OBJS} ${SINGLE} ${LIBS}
-	${LD} ${LDFLAGS} \
-		${SINGLE} ${OBJS} ${LIBS} -o $@
+	${LD} ${LDFLAGS} -o $@ \
+		${SINGLE} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 #	@${SIZE} $@
 
 netboot.bin: netboot