Cheng Shao pushed to branch wip/bump-submodules-2603 at Glasgow Haskell Compiler / GHC

Commits:

• 59862d76
  by Cheng Shao at 2026-03-17T20:03:07+00:00

  hadrian: fix ghc-in-ghci flavour stage0 shared libraries
  
  This patch fixes missing stage0 shared libraries in hadrian
  ghc-in-ghci flavour, which was accidentally dropped in
  669d09f950a6e88b903d9fd8a7571531774d4d5d and resulted in a regression
  in HLS support on linux/macos. Fixes #27057.
  

• b5a35f77
  by Cheng Shao at 2026-03-17T21:43:28+01:00

  hadrian: add thLift/thQuasiquoter to toolTargets
  
  This commit adds missing `thLift`/`thQuasiquoter` to hadrian
  `toolTargets` to keep in sync with `stage0packages`. This is now
  required when os-string/filepath is updated to include them as
  dependencies.
  

• 4d5b7f10
  by Cheng Shao at 2026-03-17T21:43:28+01:00

  libraries: bump os-string submodule to 2.0.10
  

• c078ff9f
  by Cheng Shao at 2026-03-17T21:43:28+01:00

  libraries: bump filepath submodule to 1.5.5.0
  

4 changed files:

• hadrian/src/Rules/ToolArgs.hs
• hadrian/src/Settings/Flavours/GhcInGhci.hs
• libraries/filepath
• libraries/os-string

Changes:

               , filepath

               , fileio

               , osString

+              -- os-string/filepath now depend on them

+              , thLift

+              , thQuasiquoter

               -- , ghc     -- # depends on ghc library

               -- , runGhc  -- # depends on ghc library

               , ghcBoot

       cd <- readContextData c

       ids <- liftIO $ mapM canonicalizePath [pkgPath p </> i | i <- srcDirs cd]

       return $ map (,(p, modules cd ++ otherModules cd)) ids

-

 module Settings.Flavours.GhcInGhci (ghcInGhciFlavour) where

+import qualified Data.Set as Set

 import Expression

 import Flavour

+import Oracles.Flag

 import {-# SOURCE #-} Settings.Default

 -- Please update doc/flavours.md when changing this file.

 ghcInGhciFlavour :: Flavour

 ghcInGhciFlavour = disableProfiledLibs $ defaultFlavour

     { name        = "ghc-in-ghci"

-    , extraArgs        = ghciArgs

+    , extraArgs   = ghciArgs

+    , libraryWays =

+        Set.fromList

+            <$> mconcat

+                [ pure [vanilla]

+                , platformSupportsSharedLibs ? pure [dynamic]

+                ]

     }

 ghciArgs :: Args

-Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe

+Subproject commit baac7d7e76449f76fc6785e77206edb5530b6bfb

-Subproject commit c08666bf7bf528e607fc1eacc20032ec59e69df3

+Subproject commit 71f66e1af2288867becaa567dfb10c1d791b0343