From owner-svn-src-all@freebsd.org  Wed Oct 25 21:46:34 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE0D4E54F4A;
 Wed, 25 Oct 2017 21:46:34 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9DF5A83453;
 Wed, 25 Oct 2017 21:46:34 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9PLkXUk079606;
 Wed, 25 Oct 2017 21:46:33 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9PLkXTt079605;
 Wed, 25 Oct 2017 21:46:33 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201710252146.v9PLkXTt079605@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 25 Oct 2017 21:46:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325000 - head/tools/tools/nanobsd
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/tools/tools/nanobsd
X-SVN-Commit-Revision: 325000
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Oct 2017 21:46:34 -0000

Author: bdrewery
Date: Wed Oct 25 21:46:33 2017
New Revision: 325000
URL: https://svnweb.freebsd.org/changeset/base/325000

Log:
  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

Modified:
  head/tools/tools/nanobsd/defaults.sh

Modified: head/tools/tools/nanobsd/defaults.sh
==============================================================================
--- head/tools/tools/nanobsd/defaults.sh	Wed Oct 25 21:46:30 2017	(r324999)
+++ head/tools/tools/nanobsd/defaults.sh	Wed Oct 25 21:46:33 2017	(r325000)
@@ -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
 )