diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-07-05 19:06:12 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-07-05 19:06:12 +0000 |
| commit | 2be3d7c9e84d3662a6f1ce6a57fc215d79708502 (patch) | |
| tree | 7517a71d2a1011ae4090c435badd50040c28c2ef /Makefile.inc1 | |
| parent | 373566f3f4d6afbc2f2ea1f3989a20f3e0c07ecc (diff) | |
| download | FreeBSD-src-2be3d7c9e84d3662a6f1ce6a57fc215d79708502.zip FreeBSD-src-2be3d7c9e84d3662a6f1ce6a57fc215d79708502.tar.gz | |
MFC r289861:
native-xtools: Replace common path with NXBDESTDIR.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 1adde43..d79f668 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 # |
