diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-08-05 09:06:41 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-08-08 13:48:39 +0100 |
| commit | 31f15ef0f037ca5484e55f72b3226e4e2bfb5c29 (patch) | |
| tree | 2235ab4973c282c7f99638f915e0140a1163898f | |
| parent | d464e73b488214dba0becf039290e4b23a4c3ba2 (diff) | |
| download | haskell-31f15ef0f037ca5484e55f72b3226e4e2bfb5c29.tar.gz | |
Use the correct __GLASGOW_HASKELL__ value when invoking hsc2hs on
source code to be compiled with the stage 0 compiler. (bug noticed by
David Terei - thanks!)
| -rw-r--r-- | rules/distdir-way-opts.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index 5c56169dc5..31e915d8c8 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -131,7 +131,7 @@ $1_$2_$3_ALL_HSC2HS_OPTS = \ $$(CONF_HSC2HS_OPTS) \ $$(SRC_HSC2HS_OPTS) \ $$(WAY_$3_HSC2HS_OPTS) \ - --cflag=-D__GLASGOW_HASKELL__=$$(ProjectVersionInt) \ + --cflag=-D__GLASGOW_HASKELL__=$$(if $$(filter 0,$4),$$(GhcCanonVersion),$$(ProjectVersionInt)) \ $$($1_$2_$3_HSC2HS_CC_OPTS) \ $$($1_$2_$3_HSC2HS_LD_OPTS) \ --cflag=-I$1/$2/build/autogen \ |