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.
This commit is contained in:
parent
ed4a07ffcc
commit
1b9112ea6b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=40233
@ -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:
|
# Make command line options:
|
||||||
# -DCLOBBER will remove /usr/include
|
# -DCLOBBER will remove /usr/include
|
||||||
@ -824,6 +824,7 @@ build-tools:
|
|||||||
usr.bin/wc \
|
usr.bin/wc \
|
||||||
usr.bin/xargs \
|
usr.bin/xargs \
|
||||||
usr.bin/yacc \
|
usr.bin/yacc \
|
||||||
|
usr.sbin/btxld \
|
||||||
usr.sbin/chown \
|
usr.sbin/chown \
|
||||||
usr.sbin/mtree \
|
usr.sbin/mtree \
|
||||||
usr.sbin/zic \
|
usr.sbin/zic \
|
||||||
@ -897,8 +898,6 @@ legacy-build:
|
|||||||
@echo "--------------------------------------------------------------"
|
@echo "--------------------------------------------------------------"
|
||||||
@echo ">>> Building legacy boot"
|
@echo ">>> Building legacy boot"
|
||||||
@echo "--------------------------------------------------------------"
|
@echo "--------------------------------------------------------------"
|
||||||
cd ${.CURDIR}/sys/boot && ${XMAKE} -DNOMAN -B obj depend; \
|
|
||||||
${XMAKE} -DNOMAN OBJFORMAT=elf all
|
|
||||||
cd ${.CURDIR}/sys/${MACHINE}/boot && \
|
cd ${.CURDIR}/sys/${MACHINE}/boot && \
|
||||||
${XMAKE} -DNOMAN -B obj depend; ${XMAKE} -DNOMAN all;
|
${XMAKE} -DNOMAN -B obj depend; ${XMAKE} -DNOMAN all;
|
||||||
.endif
|
.endif
|
||||||
|
@ -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.
|
# This is the old aout only boot loader.
|
||||||
.if exists(${MACHINE}/boot) && ${OBJFORMAT} == "aout"
|
.if exists(${MACHINE}/boot) && ${OBJFORMAT} == "aout"
|
||||||
SUBDIR= ${MACHINE}/boot
|
SUBDIR= ${MACHINE}/boot
|
||||||
|
.elif exists(boot) && ${MACHINE} == "i386" && ${OBJFORMAT} == "elf"
|
||||||
|
SUBDIR= boot
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if exists(boot) && ${MACHINE_ARCH} == "alpha"
|
.if exists(boot) && ${MACHINE_ARCH} == "alpha"
|
||||||
|
Loading…
Reference in New Issue
Block a user