From 62d43a3bfcc2f308fa96d56e311361b35535118b Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Thu, 20 Aug 1998 21:45:46 +0000
Subject: [PATCH] Make the build tools static to avoid trying to use the shared
 loader before it is installed.

This upsets Bruce because the host boostrap build forces tools to be
static anyway. He says I'm abusing NOTOOLS in src/Makefile by using
it to do a aout->elf transition build. One day I'll find a place to
install host tools like these to allow a true cross build.
---
 games/phantasia/Makefile         | 4 ++--
 gnu/usr.bin/cc/cc_tools/Makefile | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile
index 7108267cbb2..6174a4696a8 100644
--- a/games/phantasia/Makefile
+++ b/games/phantasia/Makefile
@@ -18,7 +18,7 @@ stamp.setuprun: monsters.asc setup
 	touch ${.TARGET}
 
 setup: phantglobs.o setup.o ${LIBM}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} phantglobs.o setup.o -lm
+	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} phantglobs.o setup.o -lm
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 \
@@ -27,7 +27,7 @@ beforeinstall:
 # Make Phantasia map.  Change the map commands reflect your installation.
 # PLOTDEVICE is used for plotting the map.  Change as appropriate.
 map: map.c
-	${CC} -O ${.CURDIR}/map.c -lplot -o ${.TARGET}
+	${CC} -static -O ${.CURDIR}/map.c -lplot -o ${.TARGET}
 	./map | plot > /dev/tty
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 550208f2438..42a13c8c6a3 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.11 1998/04/23 16:30:51 bde Exp $
+# $Id: Makefile,v 1.12 1998/07/07 01:46:41 bde Exp $
 #
 
 #
@@ -27,7 +27,7 @@ bc-$i.h: bi-$i bytecode.def
 	./bi-$i < ${GCCDIR}/bytecode.def > bc-$i.h
 
 bi-$i: bi-$i.o bi-parser.o bi-lexer.o bi-reverse.o
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	bc-$i.h bi-$i.c
 CLEANFILES+=	bi-$i
@@ -59,7 +59,7 @@ GENSRCS+=	insn-$i.c
 build-tools: gen$i
 
 gen$i: gen$i.o rtl.o obstack.o
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$i.c
 CLEANFILES+=	gen$i
@@ -69,7 +69,7 @@ CLEANFILES+=	gen$i
 build-tools: gen$i
 
 gen$i: gen$i.o rtl.o rtlanal.o print-rtl.o obstack.o
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$i.c
 CLEANFILES+=	gen$i