svn commit: r323461 - stable/11

[Ian Lepore]

Author: ian
Date: Mon Sep 11 20:33:20 2017
New Revision: 323461
URL: https://svnweb.freebsd.org/changeset/base/323461

Log:
  MFC r321876:
  
  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:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Mon Sep 11 19:57:04 2017	(r323460)
+++ stable/11/Makefile.inc1	Mon Sep 11 20:33:20 2017	(r323461)
@@ -2554,9 +2554,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
@@ -2650,7 +2647,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