Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC Commits: a5449ca9 by Sven Tennie at 2025-09-16T05:49:35+00:00 Calculate "RTS ways" The static string doesn't reflect what GHC provides in tests. - - - - - 1 changed file: - hadrian/src/Rules/Generate.hs Changes: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -24,6 +24,7 @@ import BindistConfig import GHC.Toolchain as Toolchain hiding (HsCpp(HsCpp)) import GHC.Platform.ArchOS +import qualified Data.Set as Set -- | Track this file to rebuild generated files whenever it changes. trackGenerateHs :: Expr () @@ -492,9 +493,7 @@ generateSettings settingsFile = do -- Hard-coded as Cabal queries these to determine way support and we -- need to always advertise all ways when bootstrapping. -- The settings file is generated at install time when installing a bindist. - , ("RTS ways", return "v p p p_dyn") - -- ROMES:TODO: This is what we had previously? Double check we want this hardcoded list. - -- , ("RTS ways", escapeArgs . map show . Set.toList <$> getRtsWays) + , ("RTS ways", unwords . map show . Set.toList <$> getRtsWays) , ("Relative Global Package DB", pure rel_pkg_db) , ("base unit-id", pure base_unit_id) ] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a5449ca95261320942a983e007ec5ea6... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a5449ca95261320942a983e007ec5ea6... You're receiving this email because of your account on gitlab.haskell.org.