diff options
| author | Takenobu Tani <takenobu.hs@gmail.com> | 2019-09-22 12:13:28 +0900 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-09-24 01:07:19 -0400 |
| commit | b5f24fb473560cc533143846329666896e9861be (patch) | |
| tree | d2cb30e7d228415a0535f7748c130fc2a3e1c452 | |
| parent | 146f26cc984240cea8c86ba4a82ab7b50230b2a3 (diff) | |
| download | haskell-b5f24fb473560cc533143846329666896e9861be.tar.gz | |
Hadrian: Add -haddock option for GHCi's :doc command
This commit adds -haddock option to Hadrian-based build system.
To enable :doc command on GHCi, core libraries must be compiled
with -haddock option.
Especially, the `-haddock` option is essential for a release build.
Assuming current GitLab CI condition (.gitlab-ci.yml),
I add -haddock option to the default flavour only.
This has already been done for Make-based build system.
Please see #16415.
| -rw-r--r-- | hadrian/doc/flavours.md | 2 | ||||
| -rw-r--r-- | hadrian/src/Settings/Default.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/doc/flavours.md b/hadrian/doc/flavours.md index 45479f8f68..689c3f1742 100644 --- a/hadrian/doc/flavours.md +++ b/hadrian/doc/flavours.md @@ -38,7 +38,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <td>-O<br>-H64m<br></td> <td>-O2<br>-H64m</td> <td></td> - <td></td> + <td>-haddock</td> <td></td> <td></td> <td></td> diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs index 83a3a9905e..05e98555ea 100644 --- a/hadrian/src/Settings/Default.hs +++ b/hadrian/src/Settings/Default.hs @@ -195,7 +195,7 @@ defaultSourceArgs = SourceArgs { hsDefault = mconcat [ stage0 ? arg "-O" , notStage0 ? arg "-O2" , arg "-H32m" ] - , hsLibrary = mempty + , hsLibrary = notStage0 ? arg "-haddock" , hsCompiler = mempty , hsGhc = mempty } |