Author: imp
Date: Thu Jul 10 18:28:12 2014
New Revision: 268503
URL: http://svnweb.freebsd.org/changeset/base/268503
Log:
Separate out the links creation from the other targets. This was
supposed to have been done for the original commit, but somebody
forgot.
Pointy-hat-to: imp@
Modified:
head/Makefile
head/Makefile.inc1
Modified: head/Makefile
==============================================================================
--- head/Makefile Thu Jul 10 17:52:17 2014 (r268502)
+++ head/Makefile Thu Jul 10 18:28:12 2014 (r268503)
@@ -36,6 +36,7 @@
# specified with XDEV and XDEV_ARCH.
# xdev-build - Build cross-development tools.
# xdev-install - Install cross-development tools.
+# xdev-links - Create traditional links in /usr/bin for cc, etc
#
# "quick" way to test all kernel builds:
# _jflag=`sysctl -n hw.ncpu`
@@ -110,6 +111,7 @@ TGTS= all all-man buildenv buildenvvars
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+ xdev-links \
TGTS+= ${SUBDIR_TARGETS}
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu Jul 10 17:52:17 2014 (r268502)
+++ head/Makefile.inc1 Thu Jul 10 18:28:12 2014 (r268503)
@@ -1893,7 +1893,7 @@ XDDESTDIR=${DESTDIR}/${XDTP}
OSREL!= uname -r | sed -e 's/[-(].*//'
.endif
-.ORDER: xdev-build xdev-install
+.ORDER: xdev-build xdev-install xdev-links
xdev: xdev-build xdev-install
.ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
@@ -1943,8 +1943,8 @@ _xi-mtree:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${XDDESTDIR}/usr/include >/dev/null
-.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
_xi-links
-xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
_xi-links
+.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
+xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
_xi-cross-tools:
@echo "_xi-cross-tools"
@@ -1967,9 +1967,9 @@ _xi-libraries:
${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
DESTDIR=${XDDESTDIR}
-_xi-links:
+xdev-links:
${_+_}cd ${XDDESTDIR}/usr/bin; \
- mkdir -p ../../../../usr/bin; \
+ mkdir -p ../../../../usr/bin; \
for i in *; do \
ln -sf ../../${XDTP}/usr/bin/$$i \
../../../../usr/bin/${XDDIR}-$$i; \
@@ -1977,6 +1977,6 @@ _xi-links:
../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
done
.else
-xdev xdev-build xdev-install:
+xdev xdev-build xdev-install xdev-links:
@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for
\"${.TARGET}\" target"
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
