diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-10-15 12:02:17 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-10-17 22:04:02 -0400 |
| commit | a91dcb669b3b221c51e8ba8bb85b7ae9806bc4ca (patch) | |
| tree | a0fa29c621e5f571fd4d0af9ed04e80ab1d9524d /hadrian | |
| parent | 0b995759ae2ba2161097a1c43efc650ccbce0276 (diff) | |
| download | haskell-a91dcb669b3b221c51e8ba8bb85b7ae9806bc4ca.tar.gz | |
Don't get host RTS ways via settings (#18651)
To correctly perform a linking hack for Windows we need to link with the
RTS GHC is currently using. We used to query the RTS ways via the
"settings" file but it is fragile (#18651). The hack hasn't been fixed
to take into account all the ways (Tracing) and it makes linking of GHC
with another RTS more difficult (we need to link with another RTS and to
regenerate the settings file).
So this patch uses the ways reported by the RTS itself
(GHC.Platform.Ways.hostWays) instead of the "settings" file.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index 03e1649cde..aabcde2438 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -9,7 +9,6 @@ import Data.Foldable (for_) import Base import qualified Context import Expression -import Flavour import Hadrian.Oracles.TextFile (lookupValueOrError) import Oracles.Flag import Oracles.ModuleFiles @@ -338,8 +337,6 @@ generateSettings = do , ("Tables next to code", expr $ yesNo <$> flag TablesNextToCode) , ("Leading underscore", expr $ yesNo <$> flag LeadingUnderscore) , ("Use LibFFI", expr $ yesNo <$> useLibFFIForAdjustors) - , ("Use Threads", expr $ yesNo . ghcThreaded <$> flavour) - , ("Use Debugging", expr $ yesNo . ghcDebugged <$> flavour) , ("RTS expects libdw", yesNo <$> getFlag WithLibdw) ] let showTuple (k, v) = "(" ++ show k ++ ", " ++ show v ++ ")" |