diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-03-10 21:16:01 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-03-10 21:16:01 +0000 |
| commit | 7d536dc855c85c15bf45f033d108a61b1f3cecc3 (patch) | |
| tree | 5abb86d0e160314526bb716fff070a6708d61844 /Makefile.inc1 | |
| parent | b0bdd78348d85294a359c160c307b608b2dc45f0 (diff) | |
| parent | 30d816a7b569b260360265885c779f6d8e923947 (diff) | |
| download | src-test2-7d536dc855c85c15bf45f033d108a61b1f3cecc3.tar.gz src-test2-7d536dc855c85c15bf45f033d108a61b1f3cecc3.zip | |
Notes
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f2ba7a735223..40bc9fe5b1a9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -179,9 +179,9 @@ OSRELDATE= 0 .endif # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. -.if !defined(VERSION) && !make(showconfig) -REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION -BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH +.if !defined(VERSION) +REVISION!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION +BRANCH!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ ${SRCDIR}/sys/sys/param.h VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE} @@ -244,14 +244,11 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else _TARGET_CPUTYPE=dummy .endif -# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk. -.if !make(showconfig) -_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ +_CPUTYPE!= MK_AUTO_OBJ=no MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif -.endif .if make(buildworld) BUILD_ARCH!= uname -p .if ${MACHINE_ARCH} != ${BUILD_ARCH} |