diff options
| author | rnordier <rnordier@FreeBSD.org> | 1998-10-11 18:39:38 +0000 |
|---|---|---|
| committer | rnordier <rnordier@FreeBSD.org> | 1998-10-11 18:39:38 +0000 |
| commit | 58a621267830e0d947fa79e5e7388dcb77d9abd8 (patch) | |
| tree | 01cd79cb7916203abfc962771d4a9256b4ad3dc6 | |
| parent | c911fd70c534c940fdd93b5c0dcabf8c3ad54224 (diff) | |
| download | FreeBSD-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.
| -rw-r--r-- | Makefile.inc1 | 5 | ||||
| -rw-r--r-- | sys/Makefile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c367e01..e2e64e7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc1,v 1.29 1998/10/10 19:56:59 jkh Exp $ +# $Id: Makefile.inc1,v 1.30 1998/10/11 07:41:31 peter Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -824,6 +824,7 @@ build-tools: usr.bin/wc \ usr.bin/xargs \ usr.bin/yacc \ + usr.sbin/btxld \ usr.sbin/chown \ usr.sbin/mtree \ usr.sbin/zic \ @@ -897,8 +898,6 @@ legacy-build: @echo "--------------------------------------------------------------" @echo ">>> Building legacy boot" @echo "--------------------------------------------------------------" - cd ${.CURDIR}/sys/boot && ${XMAKE} -DNOMAN -B obj depend; \ - ${XMAKE} -DNOMAN OBJFORMAT=elf all cd ${.CURDIR}/sys/${MACHINE}/boot && \ ${XMAKE} -DNOMAN -B obj depend; ${XMAKE} -DNOMAN all; .endif 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" |
