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
This commit is contained in:
parent
850be9af25
commit
d4f7b113f1
@ -131,9 +131,14 @@ TARGET_CPUTYPE?=${CPUTYPE}
|
|||||||
TARGET?= ${TARGET_ARCH}
|
TARGET?= ${TARGET_ARCH}
|
||||||
TARGET_CPUTYPE?=
|
TARGET_CPUTYPE?=
|
||||||
.endif
|
.endif
|
||||||
|
.if !empty(TARGET_CPUTYPE)
|
||||||
|
_TARGET_CPUTYPE=${TARGET_CPUTYPE}
|
||||||
|
.else
|
||||||
|
_TARGET_CPUTYPE=dummy
|
||||||
|
.endif
|
||||||
_CPUTYPE!= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \
|
_CPUTYPE!= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \
|
||||||
CPUTYPE=X${TARGET_CPUTYPE} -V CPUTYPE
|
CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE
|
||||||
.if ${_CPUTYPE} != X${TARGET_CPUTYPE}
|
.if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
|
||||||
.error CPUTYPE global should be set with ?=.
|
.error CPUTYPE global should be set with ?=.
|
||||||
.endif
|
.endif
|
||||||
.if make(buildworld)
|
.if make(buildworld)
|
||||||
|
Loading…
Reference in New Issue
Block a user