From owner-svn-src-stable-9@FreeBSD.ORG  Tue Mar 25 22:43:35 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 66A97435;
 Tue, 25 Mar 2014 22:43:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 53870ED2;
 Tue, 25 Mar 2014 22:43:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PMhZPg035248;
 Tue, 25 Mar 2014 22:43:35 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PMhZb9035247;
 Tue, 25 Mar 2014 22:43:35 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403252243.s2PMhZb9035247@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 25 Mar 2014 22:43:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r263751 - stable/9
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Mar 2014 22:43:35 -0000

Author: dim
Date: Tue Mar 25 22:43:34 2014
New Revision: 263751
URL: http://svnweb.freebsd.org/changeset/base/263751

Log:
  MFC r243322 (by marcel):
  
  Unbreak amd64 cross-build where amd64 is the target. While clang
  may be installed as cc and we don't need to build gcc as a
  cross-tools, we still build gcc and thus need cc_tools built
  as a build tool. Not doing this results in building gengenrtl with
  the target compiler while we need to run it on the build machine.

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Tue Mar 25 22:32:13 2014	(r263750)
+++ stable/9/Makefile.inc1	Tue Mar 25 22:43:34 2014	(r263751)
@@ -1204,7 +1204,7 @@ _aicasm= sys/modules/aic7xxx/aicasm
 _share=	share/syscons/scrnmaps
 .endif
 
-.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
+.if ${MK_GCC} != "no"
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif