Re: Bootstrap fails with Mavericks

[Jonathan Perkin <jperkin%joyent.com@localhost>]

* On 2013-11-17 at 18:34 PST, OBATA Akio wrote:

> On Sun, 17 Nov 2013 09:32:29 +0900, Alistair Crooks 
> <agc%pkgsrc.org@localhost> wrote:
> 
> >On Sat, Nov 16, 2013 at 04:16:53PM -0800, Jonathan Perkin wrote:
> >>* On 2013-11-16 at 15:52 PST, Jason White wrote:
> >>
> >>> Machine: Darwin smeghead 13.0.0 Darwin Kernel Version 13.0.0: Thu Sep 19
> >>> 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64 x86_64
> >>>
> >>> Using today's pkgsrc-current tree I attempted to bootstrap on Maverics
> >>> (10.9.0) with:
> >>>
> >>> ./bootstrap --abi 64 --compiler=/usr/bin/clang  (also tried /usr/bin/gcc
> >>> and no --compiler argument at all).
> >>
> >>The --compiler option doesn't take a path, just a string for each
> >>compiler, so try --compiler=clang.
> >>
> >>What's probably happening when you don't pass any options at all is it
> >>uses 'gcc' which is actually clang on Xcode5.  This confuses pkgsrc
> >>which is looking for a specific string from 'gcc -v', and then thinks
> >>that gcc isn't available and tries to build from pkgsrc.
> >
> >Yeah, it bootstrapped fine for me on Mavericks, only switch (other
> >than paths) which I had was --compiler=clang.
> 
> Following change should be useful:
> 
> Index: bootstrap
> ===================================================================
> RCS file: /cvsroot/pkgsrc/bootstrap/bootstrap,v
> retrieving revision 1.200
> diff -u -r1.200 bootstrap
> --- bootstrap   3 Oct 2013 01:24:57 -0000       1.200
> +++ bootstrap   18 Nov 2013 02:30:58 -0000
> @@ -531,6 +531,7 @@
>                 ;;
>         esac
>         unset osrev macosx_version
> +       check_compiler=yes
>         ;;
>  DragonFly)
>         root_group=wheel
> @@ -867,6 +868,9 @@
>                 compiler="gcc"
>         else
>                 case "$opsys" in
> +               Darwin) compiler="clang"
> +                       test -n "$CC" || CC=clang
> +                       ;;
>                 IRIX)
>                         if [ `uname -r` -ge 6 ]; then
>                                 compiler="mipspro"

Please only do this for 10.9, otherwise looks good.

-- 
Jonathan Perkin  -  Joyent, Inc.  -  www.joyent.com