Date: Fri, 1 Nov 2013 16:48:31 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r257509 - stable/10 Message-ID: <201311011648.rA1GmV4j064252@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311011648.rA1GmV4j064252>