diff options
| author | Reid Barton <rwbarton@gmail.com> | 2017-04-12 14:10:12 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-12 14:53:06 -0400 |
| commit | 2c1312bdf93e0c6fc64236c404f3664271f3b0f6 (patch) | |
| tree | d572d9da26d2f5daea974d21178ef193d9b408ae | |
| parent | 0ecd7fae57cfe0849b5efcce1ec14df9bbd3292e (diff) | |
| download | haskell-2c1312bdf93e0c6fc64236c404f3664271f3b0f6.tar.gz | |
Remove GhcDynamic (in favor of DYNAMIC_GHC_PROGRAMS)
DYNAMIC_GHC_PROGRAMS and GhcDynamic both tried to control whether
the ghc binary was built as a dynamic executable, with confusing
results. In particular, setting GhcDynamic=NO has no effect on
systems where DYNAMIC_GHC_PROGRAMS defaults to YES.
DYNAMIC_GHC_PROGRAMS is more fully-featured (it ensures that the
correct flavor of the libraries is built, for example) so let's
keep it and remove GhcDynamic to reduce confusion.
This effectively reverts commit 3c6190b0.
Test Plan: tested locally; harbormaster
Reviewers: simonmar, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie, snowleopard
Differential Revision: https://phabricator.haskell.org/D3428
| -rw-r--r-- | ghc/ghc.mk | 5 | ||||
| -rw-r--r-- | mk/config.mk.in | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 8d4c1dfe8e..319f969c75 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -53,9 +53,8 @@ ghc_stage2_MORE_HC_OPTS += -debug ghc_stage3_MORE_HC_OPTS += -debug endif -ifeq "$(GhcDynamic)" "YES" -ghc_stage2_MORE_HC_OPTS += -dynamic -ghc_stage3_MORE_HC_OPTS += -dynamic +ifneq "$(GhcDynamic)" "" +$(error GhcDynamic is no longer supported, use DYNAMIC_GHC_PROGRAMS instead) endif ifeq "$(GhcThreaded)" "YES" diff --git a/mk/config.mk.in b/mk/config.mk.in index 5d1f94ac6e..1f7353c9bc 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -95,7 +95,6 @@ endif # The stage number refers to the compiler stage the options are passed to. GhcDebugged=NO -GhcDynamic=NO # GhcProfiled=YES means compile a profiled stage-2 compiler GhcProfiled=NO |