summaryrefslogtreecommitdiff
path: root/testsuite/config
diff options
context:
space:
mode:
authorsheaf <sam.derbyshire@gmail.com>2018-10-28 12:30:13 -0400
committerBen Gamari <ben@smart-cactus.org>2018-10-28 13:40:14 -0400
commitbe88c818a2962adbdaca0eda539412a9bfec4384 (patch)
treefa29548be8fcc45a634b32df6859a30745017b2b /testsuite/config
parenta7f64c6cbfc5562adff207945576d1c9db2a58d9 (diff)
downloadhaskell-be88c818a2962adbdaca0eda539412a9bfec4384.tar.gz
plugins: search for .a files if necessary
Summary: on windows, plugins are loaded via .a files, but those paths were not being searched when loading plugins Test Plan: ./validate Reviewers: Phyx, bgamari Reviewed By: Phyx Subscribers: RyanGlScott, rwbarton, carter GHC Trac Issues: #15700 Differential Revision: https://phabricator.haskell.org/D5253
Diffstat (limited to 'testsuite/config')
-rw-r--r--testsuite/config/ghc21
1 files changed, 2 insertions, 19 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index b2edfd07bd..eae88ed145 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -185,7 +185,6 @@ def get_compiler_info():
config.package_conf_cache_file = ''
# See Note [WayFlags]
- # See Note [PluginWay]
if config.ghc_dynamic:
config.ghc_th_way_flags = "-dynamic"
config.ghci_way_flags = "-dynamic"
@@ -201,25 +200,9 @@ def get_compiler_info():
else:
config.ghc_th_way_flags = "-static"
config.ghci_way_flags = "-static"
- config.plugin_way_flags = "-dynamic"
+ config.plugin_way_flags = "-static"
config.ghc_th_way = "normal"
- config.ghc_plugin_way = "dyn"
-
-# Note [PluginWay]
-#
-# Unfortunately the implementation has confused the ability to make dynamic
-# libraries with dynamic way.
-#
-# This constraint is only true for systems that require -fPIC for
-# shared libraries.
-#
-# It may not be worth fixing this assumption since the only platform that doesn't
-# require -fPIC is Windows. These plugins require libghc to be linked so in
-# doing so you would exceed the amount of allowed symbols in a single shared
-# library. The only way these would ever work is thus with DynWay.
-#
-# Since the implementation has this implicit assumption, mark the tests as
-# always requiring DynWay.
+ config.ghc_plugin_way = "normal"
# Note [Replacing backward slashes in config.libdir]
#