From dca576be697f7c4c6b4e4c0a1720c2b4f7c834f4 Mon Sep 17 00:00:00 2001
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 1 Aug 2017 14:54:25 +0000
Subject: [PATCH] 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.

---
 Makefile.inc1 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 90d55a3f590a..82f9bd9b8088 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2759,9 +2759,6 @@ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${N
 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