d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

native-xtools: Override proper NXBDESTDIR.

Browse Source 
The new native-xtools uses 'make toolchain' so overriding DESTDIR
as a make argument may interfere with WORLDTMP handling.
The target also does a 'mkdir -p ${NXBDESTDIR}/usr', so we should
be modifying that rather than DESTDIR.

Note this causes the native-xtools binaries to be installed in
NANO_WORLDDIR/usr NANO_WORLDDIR/bin rather than NANO_WORLDDIR/nxb-bin/usr
and NANO_WORLDDIR/nxb-bin/bin.  This was the case before this change
as well.

MFC after:	2 weeks
Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D12782
This commit is contained in:
Bryan Drewery 2017-10-25 21:46:33 +00:00
parent b12371422a
commit e0dd694935
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=325000
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/tools/nanobsd/defaults.sh
View File

@ -438,7 +438,7 @@ native_xtools ( ) (
nano_make_install_env
set -o xtrace
cd "${NANO_SRC}"
${NANO_MAKE} native-xtools DESTDIR="${NANO_WORLDDIR}"
${NANO_MAKE} native-xtools NXBDESTDIR="${NANO_WORLDDIR}"
) > ${NANO_LOG}/_.native_xtools 2>&1
)