diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-16 00:31:04 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-16 00:31:04 +0000 |
| commit | cc2e327cf8966a9e5d8d3f3d7ce1d0867f1627ec (patch) | |
| tree | ca09a87470f4635058bbbf5ea0bd28875fcfea23 /rules/distdir-way-opts.mk | |
| parent | ca423b0578acf6b6d39c83ce34400cd35a3a1b10 (diff) | |
| download | haskell-cc2e327cf8966a9e5d8d3f3d7ce1d0867f1627ec.tar.gz | |
Change some HC_OPTS var handling
In particular, this means ghc gets built with -rtsopt, -threaded, etc again.
Diffstat (limited to 'rules/distdir-way-opts.mk')
| -rw-r--r-- | rules/distdir-way-opts.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index 5fd825361e..7a83f50c2e 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -20,7 +20,10 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage # configure-time # - SRC_HC_OPTS source-tree-wide options from build.mk # (optimisation, heap settings) -# - libraries/base_HC_OPTS options from libraries/base for all ways +# - libraries/base_HC_OPTS options from Cabal for libraries/base +# for all ways +# - libraries/base_MORE_HC_OPTS options from elsewhere in the build +# system for libraries/base for all ways # - libraries/base_v_HC_OPTS options from libraries/base for way v # - WAY_v_HC_OPTS options for this way # - EXTRA_HC_OPTS options from the command-line @@ -48,6 +51,7 @@ $1_$2_$3_MOST_HC_OPTS = \ $$(foreach pkg,$$($1_$2_DEPS),-package $$(pkg)) \ $$(if $$(findstring YES,$$($1_$2_SplitObjs)),$$(if $$(findstring dyn,$3),,-split-objs),) \ $$($1_$2_HC_OPTS) \ + $$($1_$2_MORE_HC_OPTS) \ $$($1_$2_EXTRA_HC_OPTS) \ $$($1_$2_$3_HC_OPTS) \ $$($$(basename $$<)_HC_OPTS) \ |