From owner-svn-src-head@FreeBSD.ORG  Tue Oct 29 12:34:11 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 99960C3F;
 Tue, 29 Oct 2013 12:34:11 +0000 (UTC)
 (envelope-from nyan@FreeBSD.org)
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 878F82317;
 Tue, 29 Oct 2013 12:34:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TCYB4K056939;
 Tue, 29 Oct 2013 12:34:11 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9TCYBu2056938;
 Tue, 29 Oct 2013 12:34:11 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <201310291234.r9TCYBu2056938@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Tue, 29 Oct 2013 12:34:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257329 - head
X-SVN-Group: head
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 12:34:11 -0000

Author: nyan
Date: Tue Oct 29 12:34:11 2013
New Revision: 257329
URL: http://svnweb.freebsd.org/changeset/base/257329

Log:
  Fix build.  Both clang and gcc are required on pc98.
  
  X-MFC with:	r256915

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct 29 12:25:22 2013	(r257328)
+++ head/Makefile.inc1	Tue Oct 29 12:34:11 2013	(r257329)
@@ -1388,12 +1388,17 @@ _binutils=	gnu/usr.bin/binutils
 # If an full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
-.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && ${TARGET} != "pc98"
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
 .else
 _cc=		gnu/usr.bin/cc
 .endif
+
+# The boot2 for pc98 requires gcc.
+.if ${TARGET} == "pc98"
+_cc=		gnu/usr.bin/cc
+.endif
 .endif
 
 cross-tools: .MAKE