diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-01-03 18:16:06 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-02-08 10:18:31 -0500 |
| commit | 7d04b9f298c9cc0ff291e0717826743f488670bb (patch) | |
| tree | ab1b8eaa38260db7e5d9b729fd30615ea8874c10 /hadrian/doc | |
| parent | 28b5349a1ae88872e343c58c270fe90329f14d87 (diff) | |
| download | haskell-7d04b9f298c9cc0ff291e0717826743f488670bb.tar.gz | |
hadrian: Allow override of Cabal configuration in hadrian.settings
Fixes #17612 by adding a `cabal.configure.opts` key for
`hadrian.settings`.
Diffstat (limited to 'hadrian/doc')
| -rw-r--r-- | hadrian/doc/user-settings.md | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/hadrian/doc/user-settings.md b/hadrian/doc/user-settings.md index 04a526605d..064918efe2 100644 --- a/hadrian/doc/user-settings.md +++ b/hadrian/doc/user-settings.md @@ -385,25 +385,27 @@ the right names for them: only when building the given package, or that the said options should be used when building all known packages, if the Hadrian command ever gets them to be built; -- the third slot is the builder, `ghc` or `cc`, to refer to GHC commands or - C compiler commands; -- the final slot is the builder mode, `{c, hs, link, deps, toolargs}`: +- the remaining slots specify the builder and how it was invoked, + + * `ghc` refers to GHC commands; the final slot refers to how GHC is invoked: - * `c` for commands that build C files with GHC - * `hs` for commands that compile Haskell modules with GHC - * `link` for GHC linking command - * `deps` for commands that figure out dependencies between Haskell modules - (with `ghc -M`) - * `toolargs` for GHC commands that are used to generate the right ghci - argument for `hadrian/ghci.sh` to work + * `c.opts` for commands that build C files with GHC + * `hs.opts` for commands that compile Haskell modules with GHC + * `link.opts` for GHC linking command + * `deps.opts` for commands that figure out dependencies between Haskell modules + (with `ghc -M`) + * `toolargs.opts` for GHC commands that are used to generate the right ghci + argument for `hadrian/ghci.sh` to work - for GHC and `{c, deps}`: + * `cc` refers to C compiler commands - * `c` for commands that call the C compiler on some C files - * `deps` for commands that call the C compiler for figuring out - dependencies between C files + * `c.opts` for commands that call the C compiler on some C files + * `deps.opts` for commands that call the C compiler for figuring out + dependencies between C files + + * `cabal.configure.opts` refers to Cabal configure command line. Note that + package flags can be given by adding `--flags=...` arguments. - for the C compiler; - using a wildcard (`*`) ranges over all possible values for a given "slot"; - `=` entirely overrides the arguments for a given builder in a given context, with the value specified on the right hand side of `=`, while `+=` merely |