svn commit: r255321 - in head: contrib/llvm/tools/clang/lib/Driver gnu/lib gnu/usr.bin/cc share/mk sys/sys tools/build/options

[Nathan Whitehorn]

On 09/06/13 15:08, David Chisnall wrote:
> Author: theraven
> Date: Fri Sep  6 20:08:03 2013
> New Revision: 255321
> URL: http://svnweb.freebsd.org/changeset/base/255321
>
> Log:
>   On platforms where clang is the default compiler, don't build gcc or libstdc++.
>   To enable them, set WITH_GCC and WITH_GNUCXX in src.conf.
>   Make clang default to using libc++ on FreeBSD 10.
>   Bumped __FreeBSD_version for the change.
>  . 

>
> Modified: head/share/mk/bsd.own.mk
> ==============================================================================
> --- head/share/mk/bsd.own.mk	Fri Sep  6 18:41:57 2013	(r255320)
> +++ head/share/mk/bsd.own.mk	Fri Sep  6 20:08:03 2013	(r255321)
> @@ -284,7 +284,6 @@ __DEFAULT_YES_OPTIONS = \
>      FP_LIBC \
>      FREEBSD_UPDATE \
>      GAMES \
> -    GCC \
>      GCOV \
>      GDB \
>      GNU \
> @@ -400,6 +399,11 @@ __T=${TARGET_ARCH}
>  .else
>  __T=${MACHINE_ARCH}
>  .endif
> +.if defined(TARGET)
> +__TT=${TARGET}
> +.else
> +__TT=${MACHINE_ARCH}
> +.endif

Don't you mean MACHINE here? Otherwise native builds on pc98 will fail
due to:

> +# The pc98 bootloader requires gcc to build and so we must leave gcc enabled
> +# for pc98 for now.
> +.if ${__TT} == "pc98"
> +__DEFAULT_NO_OPTIONS+=GNUCXX
> +__DEFAULT_YES_OPTIONS+=GCC
> +.else
> +__DEFAULT_NO_OPTIONS+=GCC GNUCXX
> +.endif
>
 this section, where __TT will be "i386" when built natively on pc98
systems.
-Nathan