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 /includes | |
| 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 'includes')
| -rw-r--r-- | includes/ghc.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 08e865b926..98c154bfb6 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -263,12 +263,6 @@ $(includes_SETTINGS) : includes/Makefile | $$(dir $$@)/. @echo ',("Tables next to code", "$(TablesNextToCode)")' >> $@ @echo ',("Leading underscore", "$(LeadingUnderscore)")' >> $@ @echo ',("Use LibFFI", "$(UseLibFFIForAdjustors)")' >> $@ -# Note that GhcThreaded just reflects the Makefile variable setting. In -# particular, the stage1 compiler is never actually compiled with -threaded, but -# it will nevertheless have cGhcThreaded = True. The "+RTS --info" output will -# show what RTS GHC is really using. - @echo ",(\"Use Threads\", \"$(GhcThreaded)\")" >> $@ - @echo ",(\"Use Debugging\", \"$(GhcDebugged)\")" >> $@ @echo ",(\"RTS expects libdw\", \"$(GhcRtsWithLibdw)\")" >> $@ @echo "]" >> $@ |