svn commit: r321876 - head

[Ian Lepore]

Author: ian
Date: Tue Aug  1 14:54:25 2017
New Revision: 321876
URL: https://svnweb.freebsd.org/changeset/base/321876

Log:
  In xdev-links, when installing symlinks to the cross-compiler pieces that
  includes the OS version (armv6-freebsd12.0-cc, etc), use the OS version of
  the compiler/world source code, not the version of the build host machine.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Aug  1 14:25:27 2017	(r321875)
+++ head/Makefile.inc1	Tue Aug  1 14:54:25 2017	(r321876)
@@ -2759,9 +2759,6 @@ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/u
 CD2MAKE+=	BUILD_TOOLS_META=.NOMETA
 .endif
 XDDESTDIR=${DESTDIR}/${XDTP}
-.if !defined(OSREL)
-OSREL!= uname -r | sed -e 's/[-(].*//'
-.endif
 
 .ORDER: xdev-build xdev-install xdev-links
 xdev: xdev-build xdev-install .PHONY
@@ -2855,7 +2852,7 @@ xdev-links: .PHONY
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
-			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
+			    ../../../../usr/bin/${XDDIR}${_REVISION}-$$i; \
 		done
 .else
 xdev xdev-build xdev-install xdev-links: .PHONY