diff options
author | Ben Gamari <ben@smart-cactus.org> | 2020-01-15 14:57:08 -0500 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-02-08 10:19:57 -0500 |
commit | bec76733b818b0489ffea0834ab6b1560207577c (patch) | |
tree | 556569d2f5144dbfa2c6994c83f733e9c2f17d80 /hadrian/doc | |
parent | 88bf81aaaf67e9c9bb5b12088ab33accd4a55fb3 (diff) | |
download | haskell-bec76733b818b0489ffea0834ab6b1560207577c.tar.gz |
Fix GhcThreaded setting
This adopts a patch from NetBSD's packaging fixing the `GhcThreaded`
option of the make build system. In addition we introduce a `ghcThreaded`
option in hadrian's `Flavour` type.
Also fix Hadrian's treatment of the `Use Threaded` entry in `settings`.
Previously it would incorrectly claim `Use Threaded = True` if we were
building the `threaded` runtime way. However, this is inconsistent with
the `make` build system, which defines it to be whether the `ghc`
executable is linked against the threaded runtime.
Fixes #17692.
Diffstat (limited to 'hadrian/doc')
-rw-r--r-- | hadrian/doc/user-settings.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hadrian/doc/user-settings.md b/hadrian/doc/user-settings.md index 064918efe2..de0d452fd5 100644 --- a/hadrian/doc/user-settings.md +++ b/hadrian/doc/user-settings.md @@ -35,6 +35,8 @@ data Flavour = Flavour { ghcProfiled :: Bool, -- | Build GHC with debug information. ghcDebugged :: Bool + -- | Build the GHC executable against the threaded runtime system. + ghcThreaded :: Bool, -- | Whether to build docs and which ones -- (haddocks, user manual, haddock manual) ghcDocs :: Action DocTargets } |