[commit: ghc] master: isDllName: use Opt_ExternalDynamicRefs, not WayDyn (c618732)

git at git.haskell.org git at git.haskell.org
Fri May 25 09:08:14 UTC 2018


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

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

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

commit c618732ebb234d09abb9f2ef4858d1f96b889a74
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Thu May 24 11:18:48 2018 +0100

    isDllName: use Opt_ExternalDynamicRefs, not WayDyn
    
    This should have been part of D4477, but got missed.


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

c618732ebb234d09abb9f2ef4858d1f96b889a74
 compiler/main/Packages.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index e8e9032..f27e597 100644
--- a/compiler/main/Packages.hs
+++ b/compiler/main/Packages.hs
@@ -2007,7 +2007,7 @@ isDllName :: DynFlags -> Module -> Name -> Bool
 -- the symbol comes from another dynamically-linked package,
 -- and applies on all platforms, not just Windows
 isDllName dflags this_mod name
-  | WayDyn `notElem` ways dflags = False
+  | not (gopt Opt_ExternalDynamicRefs dflags) = False
   | Just mod <- nameModule_maybe name
     -- Issue #8696 - when GHC is dynamically linked, it will attempt
     -- to load the dynamic dependencies of object files at compile



More information about the ghc-commits mailing list