diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-10-25 21:46:33 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-10-25 21:46:33 +0000 |
| commit | e0dd69493503c2204ad7be2a2251c4ddcfd62dec (patch) | |
| tree | fe36263cc64e618ffedf767e25458d745af0d9b3 /tools/tools | |
| parent | b12371422a8dce63bb3fe503154e9288ef4e44d8 (diff) | |
| download | src-e0dd69493503c2204ad7be2a2251c4ddcfd62dec.tar.gz src-e0dd69493503c2204ad7be2a2251c4ddcfd62dec.zip | |
native-xtools: Override proper NXBDESTDIR.
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
Notes
Notes:
svn path=/head/; revision=325000
Diffstat (limited to 'tools/tools')
| -rwxr-xr-x | tools/tools/nanobsd/defaults.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index e65e4d4a9815..d8d90b754eb3 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -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 ) |