diff options
author | ian <ian@FreeBSD.org> | 2017-09-11 20:33:20 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2017-09-11 20:33:20 +0000 |
commit | 35bcbb3140b9e87c032b9ff0320599445a8a285c (patch) | |
tree | a004384f6df8a0e4d68fd0ad251a184a6a187564 /Makefile.inc1 | |
parent | 02dd733dea4af80fa596d76aaf37154342a8282d (diff) | |
download | FreeBSD-src-35bcbb3140b9e87c032b9ff0320599445a8a285c.zip FreeBSD-src-35bcbb3140b9e87c032b9ff0320599445a8a285c.tar.gz |
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.
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 8e99c36..ab47bfb 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 |