@@ -876,28 +876,22 @@ newComponentCache recorder exts _cfp hsc_env old_cis new_cis = do
876
876
hscEnv' <- -- Set up a multi component session with the other units on GHC 9.4
877
877
Compat. initUnits dfs hsc_env
878
878
879
- #if MIN_VERSION_ghc(9,6,1)
880
879
let closure_errs = maybeToList $ checkHomeUnitsClosed' (hsc_unit_env hscEnv') (hsc_all_home_unit_ids hscEnv')
881
880
closure_err_to_multi_err err =
882
881
ideErrorWithSource
883
882
(Just " cradle" ) (Just DiagnosticSeverity_Warning ) _cfp
884
883
(T. pack (Compat. printWithoutUniques (singleMessage err)))
884
+ #if MIN_VERSION_ghc(9,6,1)
885
885
(Just (fmap GhcDriverMessage err))
886
- multi_errs = map closure_err_to_multi_err closure_errs
887
- bad_units = OS. fromList $ concat $ do
888
- x <- map errMsgDiagnostic closure_errs
889
- DriverHomePackagesNotClosed us <- pure x
890
- pure us
891
- isBad ci = (homeUnitId_ (componentDynFlags ci)) `OS.member` bad_units
892
886
#else
893
- let closure_errs = maybeToList $ checkHomeUnitsClosed' (hsc_unit_env hscEnv') (hsc_all_home_unit_ids hscEnv')
894
- multi_errs = map (\ diag -> ideErrorWithSource (Just " cradle" ) (Just DiagnosticSeverity_Warning ) _cfp (T. pack (Compat. printWithoutUniques (singleMessage diag))) Nothing ) closure_errs
887
+ Nothing
888
+ #endif
889
+ multi_errs = map closure_err_to_multi_err closure_errs
895
890
bad_units = OS. fromList $ concat $ do
896
891
x <- map errMsgDiagnostic closure_errs
897
892
DriverHomePackagesNotClosed us <- pure x
898
893
pure us
899
894
isBad ci = (homeUnitId_ (componentDynFlags ci)) `OS.member` bad_units
900
- #endif
901
895
-- Whenever we spin up a session on Linux, dynamically load libm.so.6
902
896
-- in. We need this in case the binary is statically linked, in which
903
897
-- case the interactive session will fail when trying to load
0 commit comments