svn commit: r256944 - stable/10

[Colin Percival]

Author: cperciva
Date: Tue Oct 22 21:53:32 2013
New Revision: 256944
URL: http://svnweb.freebsd.org/changeset/base/256944

Log:
  MFC r256921:
    Thou shalt not leak build host state into the system being compiled.
  
  Approved by:	re (gjb)

Modified:
  stable/10/Makefile.inc1   (contents, props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Tue Oct 22 21:51:07 2013	(r256943)
+++ stable/10/Makefile.inc1	Tue Oct 22 21:53:32 2013	(r256944)
@@ -128,8 +128,11 @@ OSRELDATE=	0
 .endif
 
 .if !defined(VERSION)
-VERSION!=	uname -srp
-VERSION+=	${OSRELDATE}
+REVISION!=	make -C ${.CURDIR}/release -V REVISION
+BRANCH!=	make -C ${.CURDIR}/release -V BRANCH
+SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+		${.CURDIR}/sys/sys/param.h
+VERSION=	FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
 KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64