diff options
| author | Julian Leviston <julian@leviston.net> | 2019-02-02 20:10:51 +1100 |
|---|---|---|
| committer | Julian Leviston <125-JulianLeviston@users.noreply.gitlab.haskell.org> | 2019-05-21 20:55:44 -0400 |
| commit | 0dc7985663efa1739aafb480759e2e2e7fca2a36 (patch) | |
| tree | f7adb36171f8de23061dba2d59c6bf096b4babb9 /ghc | |
| parent | 412a1f39ecc26fb8bce997bfe71e87b7284a1493 (diff) | |
| download | haskell-0dc7985663efa1739aafb480759e2e2e7fca2a36.tar.gz | |
Allow for multiple linker instances. Fixes Haskell portion of #3372.
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index da288c5e1e..5dc3aa7d4d 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -55,7 +55,8 @@ import HscMain (hscParseDeclsWithLocation, hscParseStmtWithLocation) import HsImpExp import HsSyn import HscTypes ( tyThingParent_maybe, handleFlagWarnings, getSafeMode, hsc_IC, - setInteractivePrintName, hsc_dflags, msObjFilePath, runInteractiveHsc ) + setInteractivePrintName, hsc_dflags, msObjFilePath, runInteractiveHsc, + hsc_dynLinker ) import Module import Name import Packages ( trusted, getPackageDetails, getInstalledPackageDetails, @@ -2998,6 +2999,7 @@ showCmd "-a" = showOptions True showCmd str = do st <- getGHCiState dflags <- getDynFlags + hsc_env <- GHC.getSession let lookupCmd :: String -> Maybe (m ()) lookupCmd name = lookup name $ map (\(_,b,c) -> (b,c)) cmds @@ -3017,7 +3019,7 @@ showCmd str = do , action "imports" $ showImports , action "modules" $ showModules , action "bindings" $ showBindings - , action "linker" $ getDynFlags >>= liftIO . showLinkerState + , action "linker" $ getDynFlags >>= liftIO . (showLinkerState (hsc_dynLinker hsc_env)) , action "breaks" $ showBkptTable , action "context" $ showContext , action "packages" $ showPackages |