diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-08-08 15:43:23 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-08-08 15:43:23 +0000 |
| commit | d4f7b113f1a88ebc27879090175715dd27c3d782 (patch) | |
| tree | b12b2b4383a573dc29b1c461bdd09a4fa4969b3c /Makefile.inc1 | |
| parent | 850be9af25d488cddbd586ed57679cfb30853f79 (diff) | |
| download | src-d4f7b113f1a88ebc27879090175715dd27c3d782.tar.gz src-d4f7b113f1a88ebc27879090175715dd27c3d782.zip | |
The intent in rev. 1.299 was to make the CPUTYPE assignment type check
bother "only those who attempts to set it to a different value". This
got broken in rev. 1.300 (that fixed another race).
Reported by: ache
Notes
Notes:
svn path=/head/; revision=101530
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 0ffd05cd73cd..afa3d1a8bdc5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -131,9 +131,14 @@ TARGET_CPUTYPE?=${CPUTYPE} TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif +.if !empty(TARGET_CPUTYPE) +_TARGET_CPUTYPE=${TARGET_CPUTYPE} +.else +_TARGET_CPUTYPE=dummy +.endif _CPUTYPE!= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ - CPUTYPE=X${TARGET_CPUTYPE} -V CPUTYPE -.if ${_CPUTYPE} != X${TARGET_CPUTYPE} + CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE +.if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif .if make(buildworld) |