From 3902a807acf4bccf5cd01d2115bed10d57316661 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 21 Aug 2018 08:34:50 +0100 Subject: Load plugins when starting a GHC session (#905) Fixes #900 (cherry picked from commit e6aa8fb47b9477cc5ef5e46097524fe83e080f6d) --- haddock-api/src/Haddock.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'haddock-api/src/Haddock.hs') diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs index 00eb50f6..86a65901 100644 --- a/haddock-api/src/Haddock.hs +++ b/haddock-api/src/Haddock.hs @@ -75,6 +75,7 @@ import Packages import Panic (handleGhcException) import Module import FastString +import qualified DynamicLoading -------------------------------------------------------------------------------- -- * Exception handling @@ -437,7 +438,10 @@ withGhc' libDir flags ghcActs = runGhc (Just libDir) $ do -- that may need to be re-linked: Haddock doesn't do any -- dynamic or static linking at all! _ <- setSessionDynFlags dynflags'' - ghcActs dynflags'' + hscenv <- GHC.getSession + dynflags''' <- liftIO (DynamicLoading.initializePlugins hscenv dynflags'') + _ <- setSessionDynFlags dynflags''' + ghcActs dynflags''' where -- ignore sublists of flags that start with "+RTS" and end in "-RTS" -- cgit v1.2.3