[commit: ghc] master: Give hsc2hs different options in different stages; fixes #7705 (f1fcfff)

[Bill Tutt]

If the bootstrapping compiler is the Haskell Platform on Windows this
change can break the build if the Platofrm install directory includes
spaces.
Since before this change the intree gcc was always used on Windows, but now
the bootstrapping ghc's gcc is used for CC_STAGE0 for hsc2hs invocations.

Adding wrapping single quotes like $1_$2_HSC2HS_CC_OPTS and
$1_$2_HSC2HS_LD_OPTS
to the --cc and --ld options seems like the simplest and best solution.

Fyi,
Bill

On Sat, Mar 2, 2013 at 9:43 AM, Ian Lynagh <igloo at earth.li> wrote:

>
> diff --git a/rules/distdir-opts.mk b/rules/distdir-opts.mk
> index 748e27e..50cc05e 100644
> --- a/rules/distdir-opts.mk
> +++ b/rules/distdir-opts.mk
> @@ -79,10 +79,11 @@ $1_$2_HSC2HS_LD_OPTS:=$$(shell for i in
> $$($1_$2_DIST_LD_OPTS); do echo \'--lfla
>  endif
>
>  $1_$2_ALL_HSC2HS_OPTS = \
> - --cc=$$(WhatGccIsCalled) \
> - --ld=$$(WhatGccIsCalled) \
> + --cc=$$(CC_STAGE$3) \
> + --ld=$$(CC_STAGE$3) \
>   $$(CONF_HSC2HS_OPTS) \
>   $$(SRC_HSC2HS_OPTS) \
> + $$(SRC_HSC2HS_OPTS_STAGE$3) \
>   --cflag=-D__GLASGOW_HASKELL__=$$(if $$(filter
> 0,$3),$$(GhcCanonVersion),$$(ProjectVersionInt)) \
>   --cflag=-D$$(HostArch_CPP)_HOST_ARCH=1 \
>   --cflag=-D$$(HostOS_CPP)_HOST_OS=1 \
>
>
>
> _______________________________________________
> ghc-commits mailing list
> ghc-commits at haskell.org
> http://www.haskell.org/mailman/listinfo/ghc-commits
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/ghc-devs/attachments/20130313/9e4115ff/attachment.htm>