diff options
| author | Ian Lepore <ian@FreeBSD.org> | 2017-08-01 14:54:25 +0000 |
|---|---|---|
| committer | Ian Lepore <ian@FreeBSD.org> | 2017-08-01 14:54:25 +0000 |
| commit | dca576be697f7c4c6b4e4c0a1720c2b4f7c834f4 (patch) | |
| tree | a0c81f75d4a533aed2e3d5da50725a342155f967 /Makefile.inc1 | |
| parent | 6630716fa867c0db00f77a63c1f29e6be4fa03e5 (diff) | |
| download | src-test-dca576be697f7c4c6b4e4c0a1720c2b4f7c834f4.tar.gz src-test-dca576be697f7c4c6b4e4c0a1720c2b4f7c834f4.zip | |
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.
Notes
Notes:
svn path=/head/; revision=321876
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 90d55a3f590aa..82f9bd9b80881 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 |