From 35bcbb3140b9e87c032b9ff0320599445a8a285c Mon Sep 17 00:00:00 2001
From: ian <ian@FreeBSD.org>
Date: Mon, 11 Sep 2017 20:33:20 +0000
Subject: [PATCH] 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.
---
 Makefile.inc1 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8e99c36e119..ab47bfb6d35 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2554,9 +2554,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
@@ -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
-- 
2.45.0