From 9281a6c0db13e4c2d927dc7200958e0bc59c4124 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 5 Aug 2002 08:54:26 +0000
Subject: [PATCH] An empty CPUTYPE now means ``the default CPUTYPE'' in
 bsd.cpu.mk. If there was no CPUTYPE assignment in /etc/make.conf, this would
 cause the ``CPUTYPE assignment type'' check to falsely fail.

Reported by:	johan

Fixed this by making sure we always pass the non-empty CPUTYPE.
Also make sure we use the correct set of share/mk files in our
test.
---
 Makefile.inc1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 37b80e5d96dc..e1216d3514a7 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -131,8 +131,9 @@ TARGET_CPUTYPE?=${CPUTYPE}
 TARGET?=	${TARGET_ARCH}
 TARGET_CPUTYPE?=
 .endif
-_CPUTYPE!=	cd ${.CURDIR}; ${MAKE} CPUTYPE=${TARGET_CPUTYPE} -V CPUTYPE
-.if ${_CPUTYPE} != ${TARGET_CPUTYPE}
+_CPUTYPE!=	cd ${.CURDIR}; ${MAKE} -m ${.CURDIR}/share/mk \
+		CPUTYPE=X${TARGET_CPUTYPE} -V CPUTYPE
+.if ${_CPUTYPE} != X${TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
 .if make(buildworld)