Fix compilation with cabal-helper-0.8

Still need to integrate logic changes for backpack etc.
This commit is contained in:
Daniel Gröber 2018-01-21 13:12:11 +01:00
parent c3530f75d5
commit b52085a88f

View File

@ -112,7 +112,7 @@ initSession opts mdf = do
putNewSession s = do
crdl <- cradle
nhsc_env_ref <- liftIO . newIORef =<< newLightEnv (initDF crdl)
runLightGhc' nhsc_env_ref $ setSessionDynFlags =<< getSessionDynFlags
_ <- runLightGhc' nhsc_env_ref $ setSessionDynFlags =<< getSessionDynFlags
gmsPut s { gmGhcSession = Just $ GmGhcSession nhsc_env_ref }
@ -367,7 +367,7 @@ resolveEntrypoint Cradle {..} c@GmComponent {..} = do
-- ghc do the warning about it. Right now we run that module through
-- resolveModule like any other
resolveChEntrypoints :: FilePath -> ChEntrypoint -> IO [CompilationUnit]
resolveChEntrypoints _ (ChLibEntrypoint em om) =
resolveChEntrypoints _ (ChLibEntrypoint em om _) =
return $ map (Right . chModToMod) (em ++ om)
resolveChEntrypoints _ (ChExeEntrypoint main om) =