diff options
| author | ru <ru@FreeBSD.org> | 2002-08-05 08:54:26 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-08-05 08:54:26 +0000 |
| commit | 9281a6c0db13e4c2d927dc7200958e0bc59c4124 (patch) | |
| tree | a5dd9c5647075e1d09ca1bab00a8bb6f36b40aa7 /Makefile.inc1 | |
| parent | 14e8a8cb747ee8bcc3662682ff9fba8068c83e95 (diff) | |
| download | FreeBSD-src-9281a6c0db13e4c2d927dc7200958e0bc59c4124.zip FreeBSD-src-9281a6c0db13e4c2d927dc7200958e0bc59c4124.tar.gz | |
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.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 37b80e5..e1216d3 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) |
