svn commit: r232322 - in head: . gnu/usr.bin/cc/c++ gnu/usr.bin/cc/cc gnu/usr.bin/cc/cpp share/mk sys/conf tools/build/options usr.bin/clang/clang

[John Baldwin]

On Thursday, March 01, 2012 3:22:27 pm Dimitry Andric wrote:
> On 2012-03-01 20:34, John Baldwin wrote:
> > On Wednesday, February 29, 2012 5:58:52 pm Dimitry Andric wrote:
> >> Author: dim
> >> Date: Wed Feb 29 22:58:51 2012
> >> New Revision: 232322
> >> URL: http://svn.freebsd.org/changeset/base/232322
> >>
> >> Log:
> >>   Add a WITH_CLANG_IS_CC option for src.conf(5), disabled by default, that
> >>   installs clang as /usr/bin/cc, /usr/bin/c++ and /usr/bin/cpp.
> >>   
> >>   Note this does *not* disable building and installing gcc, which will
> >>   still be available as /usr/bin/gcc, /usr/bin/g++ and /usr/bin/gcpp.  If
> >>   you want to disable gcc completely, you must use WITHOUT_GCC.
> >>   
> >>   MFC after:	2 weeks
> > 
> > This seems to have broken the ability to build world on older machines.  
> > Specifically, I have a little netbook whose last world was from May 2011 and 
> > when I tried to do a buildworld today, it blew up with this trying to do a 
> > build:
> > 
> >> make buildworld
> > "/usr/src/Makefile.inc1", line 1111: Malformed conditional (${MK_GCC} != "no" 
> > && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"))
> > "/usr/src/Makefile.inc1", line 1113: if-less endif
> > "/usr/src/Makefile.inc1", line 1173: Malformed conditional (${MK_CLANG} != 
> > "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"))
> > "/usr/src/Makefile.inc1", line 1176: if-less endif
> > "/usr/src/Makefile.inc1", line 1178: Malformed conditional (${MK_GCC} != "no" 
> > && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"))
> > "/usr/src/Makefile.inc1", line 1180: if-less endif
> > "/usr/src/Makefile.inc1", line 1241: Malformed conditional (${MK_LIBCPLUSPLUS} 
> > != "no")
> > "/usr/src/Makefile.inc1", line 1243: if-less endif
> > make: fatal errors encountered -- cannot continue
> > *** Error code 1
> 
> Strange, it's like it isn't reading the updated bsd.own.mk (which is
> where all the MK_XXX settings originate).  Are you sure your tree is
> completely updated?  What are your make.conf and src.conf settings?

Turns out to be a false alarm, my tree wasn't fully updated due to csup(1)
sucking.

-- 
John Baldwin