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
1 changed file:
Changes:
| ... | ... | @@ -24,6 +24,7 @@ import BindistConfig |
| 24 | 24 | |
| 25 | 25 | import GHC.Toolchain as Toolchain hiding (HsCpp(HsCpp))
|
| 26 | 26 | import GHC.Platform.ArchOS
|
| 27 | +import qualified Data.Set as Set
|
|
| 27 | 28 | |
| 28 | 29 | -- | Track this file to rebuild generated files whenever it changes.
|
| 29 | 30 | trackGenerateHs :: Expr ()
|
| ... | ... | @@ -492,9 +493,7 @@ generateSettings settingsFile = do |
| 492 | 493 | -- Hard-coded as Cabal queries these to determine way support and we
|
| 493 | 494 | -- need to always advertise all ways when bootstrapping.
|
| 494 | 495 | -- The settings file is generated at install time when installing a bindist.
|
| 495 | - , ("RTS ways", return "v p p p_dyn")
|
|
| 496 | - -- ROMES:TODO: This is what we had previously? Double check we want this hardcoded list.
|
|
| 497 | - -- , ("RTS ways", escapeArgs . map show . Set.toList <$> getRtsWays)
|
|
| 496 | + , ("RTS ways", unwords . map show . Set.toList <$> getRtsWays)
|
|
| 498 | 497 | , ("Relative Global Package DB", pure rel_pkg_db)
|
| 499 | 498 | , ("base unit-id", pure base_unit_id)
|
| 500 | 499 | ]
|