[Git][ghc/ghc][wip/hadrian-cross-stage2] Hard-code ways in settings

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/hadrian-cross-stage2 at Glasgow Haskell Compiler / GHC


Commits:
e2582850 by Matthew Pickering at 2024-10-07T15:14:21+01:00
Hard-code ways in settings

- - - - -


1 changed file:

- hadrian/src/Rules/Generate.hs


Changes:

=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -7,7 +7,6 @@ module Rules.Generate (
 
 import Development.Shake.FilePath
 import Data.Char (isSpace)
-import qualified Data.Set as Set
 import Base
 import qualified Context
 import Expression
@@ -523,7 +522,10 @@ generateSettings settingsFile = do
 
         , ("Use interpreter", expr $ yesNo <$> ghcWithInterpreter stage)
         , ("Support SMP", expr $ yesNo <$> targetSupportsSMP stage)
-        , ("RTS ways", escapeArgs . map show . Set.toList <$> getRtsWays)
+        -- 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")
         , ("Tables next to code", queryTarget stage (yesNo . tgtTablesNextToCode))
         , ("Leading underscore",  queryTarget stage (yesNo . tgtSymbolsHaveLeadingUnderscore))
         , ("Use LibFFI", expr $ yesNo <$> targetUseLibffiForAdjustors stage)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e25828500273dfe0b0fea318214ddcb66a140da1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e25828500273dfe0b0fea318214ddcb66a140da1
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241007/88ba7826/attachment-0001.html>