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 /compiler/GHC/Settings | |
| 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 'compiler/GHC/Settings')
| -rw-r--r-- | compiler/GHC/Settings/IO.hs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/compiler/GHC/Settings/IO.hs b/compiler/GHC/Settings/IO.hs index 792937bd19..cd1c210ee7 100644 --- a/compiler/GHC/Settings/IO.hs +++ b/compiler/GHC/Settings/IO.hs @@ -155,8 +155,6 @@ initSettings top_dir = do ghcWithSMP <- getBooleanSetting "Support SMP" ghcRTSWays <- getSetting "RTS ways" useLibFFI <- getBooleanSetting "Use LibFFI" - ghcThreaded <- getBooleanSetting "Use Threads" - ghcDebugged <- getBooleanSetting "Use Debugging" ghcRtsWithLibdw <- getBooleanSetting "RTS expects libdw" return $ Settings @@ -225,8 +223,6 @@ initSettings top_dir = do , platformMisc_ghcWithSMP = ghcWithSMP , platformMisc_ghcRTSWays = ghcRTSWays , platformMisc_libFFI = useLibFFI - , platformMisc_ghcThreaded = ghcThreaded - , platformMisc_ghcDebugged = ghcDebugged , platformMisc_ghcRtsWithLibdw = ghcRtsWithLibdw , platformMisc_llvmTarget = llvmTarget } |