Disable AUTO_OBJ as a make argument to ensure it really is disabled.
If the user sets this to yes as a make argument too we still want to ensure these do not get enabled. Sponsored by: Dell EMC Isilon
This commit is contained in:
+4
-4
@@ -365,11 +365,11 @@ OSRELDATE= 0
|
||||
|
||||
# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
|
||||
.if !defined(_REVISION)
|
||||
_REVISION!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION
|
||||
_REVISION!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V REVISION
|
||||
.export _REVISION
|
||||
.endif
|
||||
.if !defined(_BRANCH)
|
||||
_BRANCH!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH
|
||||
_BRANCH!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V BRANCH
|
||||
.export _BRANCH
|
||||
.endif
|
||||
.if !defined(SRCRELDATE)
|
||||
@@ -439,8 +439,8 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
|
||||
.else
|
||||
_TARGET_CPUTYPE=dummy
|
||||
.endif
|
||||
_CPUTYPE!= MK_AUTO_OBJ=no MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
|
||||
-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
|
||||
_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \
|
||||
-m ${.CURDIR}/share/mk MK_AUTO_OBJ=no -V CPUTYPE
|
||||
.if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
|
||||
.error CPUTYPE global should be set with ?=.
|
||||
.endif
|
||||
|
||||
Reference in New Issue
Block a user