Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Oct 2013 12:34:11 +0000 (UTC)
From:      Takahashi Yoshihiro <nyan@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r257329 - head
Message-ID:  <201310291234.r9TCYBu2056938@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310291234.r9TCYBu2056938>