From owner-svn-src-head@freebsd.org  Tue Dec  5 21:36:09 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 8EBF7E83180;
 Tue,  5 Dec 2017 21:36:09 +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 5BFC87215A;
 Tue,  5 Dec 2017 21:36:09 +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 vB5La8ld023716;
 Tue, 5 Dec 2017 21:36:08 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB5La8T3023715;
 Tue, 5 Dec 2017 21:36:08 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201712052136.vB5La8T3023715@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: Tue, 5 Dec 2017 21:36:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326583 - head
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head
X-SVN-Commit-Revision: 326583
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Dec 2017 21:36:09 -0000

Author: bdrewery
Date: Tue Dec  5 21:36:08 2017
New Revision: 326583
URL: https://svnweb.freebsd.org/changeset/base/326583

Log:
  native-xtools: Ensure GCC files are cleaned up.
  
  Because we force enable MK_GCC when building we need to also force
  enable it for the cleaning phase.  Otherwise the NXB_TARGET files
  are found in the next build's kernel-toolchain phase and cause
  an error.
  
  Reported by:	sbruno
  X-MFC-With:	r325001
  MFC after:	1 month
  Sponsored by:	Dell EMC

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Dec  5 21:30:22 2017	(r326582)
+++ head/Makefile.inc1	Tue Dec  5 21:36:08 2017	(r326583)
@@ -2261,7 +2261,7 @@ NXBMAKE+=	SUBDIR_OVERRIDE='$${NXBDIRS:M*}'
 # even if the TARGET being built for wants GCC.
 NXBMAKE+=	WANT_COMPILER_TYPE='$${X_COMPILER_TYPE}'
 native-xtools: .PHONY
-	${_+_}cd ${.CURDIR}; ${NXBTMAKE} _cleanobj
+	${_+_}cd ${.CURDIR}; ${NXBTMAKE} _cleanobj MK_GCC=yes
 	# Build the bootstrap/host/cross tools that produce native binaries
 	# Pass along MK_GCC=yes to ensure GCC-needed build tools are built.
 	# We don't quite know what the NXB_TARGET wants so just build it.