summaryrefslogtreecommitdiff
path: root/testsuite/config/ghc
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2021-04-06 13:56:53 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-04-07 12:39:00 -0400
commitd014ab0db0c167ab5a0f9cb15280aee6fd8f3621 (patch)
tree9c60484f66b951774db80f2de2e98e978087467a /testsuite/config/ghc
parent546f8b1478e43f18b25236a20c6c30fa986a046a (diff)
downloadhaskell-d014ab0db0c167ab5a0f9cb15280aee6fd8f3621.tar.gz
Remove dynamic-by-default (#16782)
Dynamic-by-default was a mechanism to automatically select the -dynamic way for some targets. It was implemented in a convoluted way: it was defined as a flavour option, hence it couldn't be passed as a global settings (which are produced by `configure` before considering flavours), so a build system rule was used to pass -DDYNAMIC_BY_DEFAULT to the C compiler so that deriveConstants could infer it. * Make build system has it disabled for 8 years (951e28c0625ece7e0db6ac9d4a1e61e2737b10de) * It has never been implemented in Hadrian * Last time someone tried to enable it 1 year ago it didn't work (!2436) * Having this as a global constant impedes making GHC multi-target (see !5427) This commit fully removes support for dynamic-by-default. If someone wants to reimplement something like this, it would probably need to move the logic in the compiler. (Doing this would probably need some refactoring of the way the compiler handles DynFlags: DynFlags are used to store and to pass enabled ways to many parts of the compiler. It can be set by command-line flags, GHC API, global settings. In multi-target GHC, we will use DynFlags to load the target platform and its constants: but at this point with the current DynFlags implementation we can't easily update the existing DynFlags with target-specific options such as dynamic-by-default without overriding ways previously set by the user.)
Diffstat (limited to 'testsuite/config/ghc')
-rw-r--r--testsuite/config/ghc7
1 files changed, 2 insertions, 5 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index fa2c9d7c7c..4ecdc5bcb0 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -55,11 +55,8 @@ if ghc_with_threaded_rts:
if ghc_with_dynamic_rts:
config.have_shared_libs = True
-if config.ghc_dynamic_by_default and config.have_vanilla == 1:
- config.run_ways.append('static')
-else:
- if ghc_with_dynamic_rts:
- config.run_ways.append('dyn')
+if ghc_with_dynamic_rts:
+ config.run_ways.append('dyn')
if (config.have_profiling and ghc_with_threaded_rts):
config.run_ways.append('profthreaded')