d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

An empty CPUTYPE now means ``the default CPUTYPE'' in bsd.cpu.mk.

Browse Source 
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.
This commit is contained in:
Ruslan Ermilov 2002-08-05 08:54:26 +00:00
parent 0aed4a4c3f
commit 9f3089acef
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -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)