From 5de6e021cbc78cb0364079800437a869e53ff837 Mon Sep 17 00:00:00 2001 From: Demi Marie Obenour Date: Thu, 1 Dec 2016 16:56:04 -0500 Subject: [PATCH] Delete references to the splitter `-split-objs` [is dying]. When it goes, Haddock fails to compile, because it references a non-existent flag. [is dying]: https://phabricator.haskell.org/D2768 --- haddock-api/src/Haddock.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs index 28974d1953..2c99596c01 100644 --- a/haddock-api/src/Haddock.hs +++ b/haddock-api/src/Haddock.hs @@ -398,13 +398,12 @@ withGhc' libDir flags ghcActs = runGhc (Just libDir) $ do ghcMode = CompManager, ghcLink = NoLink } - let dynflags'' = gopt_unset dynflags' Opt_SplitObjs - defaultCleanupHandler dynflags'' $ do + defaultCleanupHandler dynflags' $ do -- ignore the following return-value, which is a list of packages -- that may need to be re-linked: Haddock doesn't do any -- dynamic or static linking at all! - _ <- setSessionDynFlags dynflags'' - ghcActs dynflags'' + _ <- setSessionDynFlags dynflags' + ghcActs dynflags' where parseGhcFlags :: MonadIO m => DynFlags -> m DynFlags parseGhcFlags dynflags = do