Author: gjb
Date: Fri Nov 1 16:48:30 2013
New Revision: 257509
URL: http://svnweb.freebsd.org/changeset/base/257509
Log:
MFC r257329 (nyan):
Fix build, both clang and gcc are required on pc98.
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/Makefile.inc1 (contents, props changed)
Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1 Fri Nov 1 16:03:38 2013 (r257508)
+++ stable/10/Makefile.inc1 Fri Nov 1 16:48:30 2013 (r257509)
@@ -1381,12 +1381,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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
