From b5f24fb473560cc533143846329666896e9861be Mon Sep 17 00:00:00 2001 From: Takenobu Tani Date: Sun, 22 Sep 2019 12:13:28 +0900 Subject: 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. --- hadrian/doc/flavours.md | 2 +- 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 -O
-H64m
-O2
-H64m - + -haddock 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 } -- cgit v1.2.1