Author: bdrewery
Date: Wed Jul 5 19:06:12 2017
New Revision: 320691
URL: https://svnweb.freebsd.org/changeset/base/320691
Log:
MFC r289861:
native-xtools: Replace common path with NXBDESTDIR.
Modified:
stable/10/Makefile.inc1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1 Wed Jul 5 17:39:17 2017 (r320690)
+++ stable/10/Makefile.inc1 Wed Jul 5 19:06:12 2017 (r320691)
@@ -1555,12 +1555,13 @@ cross-tools: .MAKE .PHONY
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
.endfor
+NXBDESTDIR= ${OBJTREE}/nxb-bin
NXBENV= MAKEOBJDIRPREFIX=${OBJTREE}/nxb \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
VERSION="${VERSION}"
NXBMAKE= ${NXBENV} ${MAKE} \
- TBLGEN=${OBJTREE}/nxb-bin/usr/bin/tblgen \
- CLANG_TBLGEN=${OBJTREE}/nxb-bin/usr/bin/clang-tblgen \
+ TBLGEN=${NXBDESTDIR}/usr/bin/tblgen \
+ CLANG_TBLGEN=${NXBDESTDIR}/usr/bin/clang-tblgen \
MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
-DWITHOUT_GDB -DNO_TESTS \
SSP_CFLAGS= \
@@ -1570,13 +1571,11 @@ NXBMAKE= ${NXBENV} ${MAKE} \
-DWITHOUT_CLANG_FULL -DWITHOUT_LLDB
native-xtools: .PHONY
- mkdir -p ${OBJTREE}/nxb-bin/bin
- mkdir -p ${OBJTREE}/nxb-bin/sbin
- mkdir -p ${OBJTREE}/nxb-bin/usr
+ mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
- -p ${OBJTREE}/nxb-bin/usr >/dev/null
+ -p ${NXBDESTDIR}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
- -p ${OBJTREE}/nxb-bin/usr/include >/dev/null
+ -p ${NXBDESTDIR}/usr/include >/dev/null
.for _tool in \
bin/cat \
bin/chmod \
@@ -1640,7 +1639,7 @@ native-xtools: .PHONY
${NXBMAKE} DIRPRFX=${_tool}/ obj; \
${NXBMAKE} DIRPRFX=${_tool}/ depend; \
${NXBMAKE} DIRPRFX=${_tool}/ all; \
- ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${OBJTREE}/nxb-bin install
+ ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install
.endfor
#
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
