[commit: ghc] master: Remove GhcDynamic (in favor of DYNAMIC_GHC_PROGRAMS) (2c1312b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2c1312bdf93e0c6fc64236c404f3664271f3b0f6/ghc

>---------------------------------------------------------------

commit 2c1312bdf93e0c6fc64236c404f3664271f3b0f6
Author: Reid Barton <rwbarton at gmail.com>
Date:   Wed Apr 12 14:10:12 2017 -0400

    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


>---------------------------------------------------------------

2c1312bdf93e0c6fc64236c404f3664271f3b0f6
 ghc/ghc.mk      | 5 ++---
 mk/config.mk.in | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 8d4c1df..319f969 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 5d1f94a..1f7353c 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