From 1211a972fd970fd0d7e5f4b2d8b49c2cbcd47e6c Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 9 Nov 2006 17:16:56 +0000 Subject: [PATCH] buildworld depends on hw.machine exported from the kernel being correct. This designation has recently changed from i386 to pc32. Add a check to buildworld to report the problem and to tell the user how to fix it. Reported-by: YONETANI Tomokazu --- Makefile.inc1 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b6d01453d5..65c5024aa3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.91 2006/11/07 06:56:59 dillon Exp $ +# $DragonFly: src/Makefile.inc1,v 1.92 2006/11/09 17:16:56 dillon Exp $ # # Build-time options are documented in make.conf(5). # @@ -365,7 +365,7 @@ everything: # note: we include _obj in realquickworld to prevent accidental creation # of files in /usr/src. -WMAKE_TGTS= +WMAKE_TGTS= buildcheck .if !defined(SUBDIR_OVERRIDE) WMAKE_TGTS+= _worldtmp _bootstrap-tools .endif @@ -385,10 +385,21 @@ crossworld: _worldtmp _bootstrap-tools _obj _build-tools _cross-tools .ORDER: ${WMAKE_TGTS} +# +# buildcheck +# +# Checks to be sure that the system is ready for a buildworld +buildcheck: +.if ${MACHINE} == "i386" + @echo "You are running a kernel which is reporting an old platform architecture name," + @echo "which will confuse buildworld. Please 'setenv MACHINE pc32' and try again." + exit 1 +.endif + # # installcheck # -# Checks to be sure system is ready for installworld +# Checks to be sure that the system is ready for an installworld # installcheck: .if !defined(NO_SENDMAIL) -- 2.41.0