summaryrefslogtreecommitdiffstats
path: root/sys/Makefile
diff options
context:
space:
mode:
authorrnordier <rnordier@FreeBSD.org>1998-10-11 18:39:38 +0000
committerrnordier <rnordier@FreeBSD.org>1998-10-11 18:39:38 +0000
commit58a621267830e0d947fa79e5e7388dcb77d9abd8 (patch)
tree01cd79cb7916203abfc962771d4a9256b4ad3dc6 /sys/Makefile
parentc911fd70c534c940fdd93b5c0dcabf8c3ad54224 (diff)
downloadFreeBSD-src-58a621267830e0d947fa79e5e7388dcb77d9abd8.zip
FreeBSD-src-58a621267830e0d947fa79e5e7388dcb77d9abd8.tar.gz
In src/Makefile.inc1:
Remove /sys/boot from legacy-build. Add btxld to build-tools. In src/sys/Makefile: Add /sys/boot for i386 ELF. I'm still not sure why the new boot code was being built along with the legacy stuff, which meant a completely wrong default environment for it. This may well still be the wrong way to go about this, but it can't work all that much worse than it has been.
Diffstat (limited to 'sys/Makefile')
-rw-r--r--sys/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/Makefile b/sys/Makefile
index 02f77bf..470207d 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,8 +1,10 @@
-# $Id: Makefile,v 1.11 1998/09/05 08:27:56 jb Exp $
+# $Id: Makefile,v 1.12 1998/10/04 00:42:08 gpalmer Exp $
# This is the old aout only boot loader.
.if exists(${MACHINE}/boot) && ${OBJFORMAT} == "aout"
SUBDIR= ${MACHINE}/boot
+.elif exists(boot) && ${MACHINE} == "i386" && ${OBJFORMAT} == "elf"
+SUBDIR= boot
.endif
.if exists(boot) && ${MACHINE_ARCH} == "alpha"
OpenPOWER on IntegriCloud