From owner-svn-src-stable-12@freebsd.org  Tue Apr  7 18:41:52 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id E515D279353;
 Tue,  7 Apr 2020 18:41:52 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48xbq45nRHz44Xl;
 Tue,  7 Apr 2020 18:41:52 +0000 (UTC)
 (envelope-from mhorne@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1CA9E514;
 Tue,  7 Apr 2020 18:41:52 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 037IfqVR023883;
 Tue, 7 Apr 2020 18:41:52 GMT (envelope-from mhorne@FreeBSD.org)
Received: (from mhorne@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 037IfqDr023882;
 Tue, 7 Apr 2020 18:41:52 GMT (envelope-from mhorne@FreeBSD.org)
Message-Id: <202004071841.037IfqDr023882@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mhorne set sender to
 mhorne@FreeBSD.org using -f
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Tue, 7 Apr 2020 18:41:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r359709 - stable/12
X-SVN-Group: stable-12
X-SVN-Commit-Author: mhorne
X-SVN-Commit-Paths: stable/12
X-SVN-Commit-Revision: 359709
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2020 18:41:53 -0000

Author: mhorne
Date: Tue Apr  7 18:41:52 2020
New Revision: 359709
URL: https://svnweb.freebsd.org/changeset/base/359709

Log:
  MFC r359289:
  
  Makefile.inc1: override MACHINE for native-xtools

Modified:
  stable/12/Makefile.inc1
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1	Tue Apr  7 17:50:18 2020	(r359708)
+++ stable/12/Makefile.inc1	Tue Apr  7 18:41:52 2020	(r359709)
@@ -2474,6 +2474,7 @@ NXBMAKE+=	XCC="${NXBOBJTOP}/tmp/usr/bin/cc" \
 		XCPP="${NXBOBJTOP}/tmp/usr/bin/cpp"
 .endif
 NXBMAKE+=	${NXBMAKEENV} ${MAKE} -f Makefile.inc1 ${NXBMAKEARGS} \
+		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \
 		TARGET=${NXB_TARGET} TARGET_ARCH=${NXB_TARGET_ARCH} \
 		TARGET_TRIPLE=${MACHINE_TRIPLE:Q}
 # NXBDIRS is improperly based on MACHINE rather than NXB_TARGET.  Need to