[commit: ghc] master: Make :doc work for the ghc library (25e1ea9)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/25e1ea997524b1d9f9b1fc065b17e618b8f16f18/ghc

>---------------------------------------------------------------

commit 25e1ea997524b1d9f9b1fc065b17e618b8f16f18
Author: Simon Jakobi <simon.jakobi at gmail.com>
Date:   Thu Jul 26 17:17:17 2018 -0400

    Make :doc work for the ghc library
    
    We already include -haddock in the GhcLibHcOpts in order to include
    the boot libraries' docs in their .hi-files.
    
    By including -haddock in the GhcStage2HcOpts and GhcStage3HcOpts, we
    make the docs for the ghc library also available to the GHCi :doc
    command.
    
    Reviewers: bgamari
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D4913


>---------------------------------------------------------------

25e1ea997524b1d9f9b1fc065b17e618b8f16f18
 mk/config.mk.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index c97f551..90579fb 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -66,9 +66,12 @@ GhcHcOpts=-Rghc-timing
 # override options from $(GhcHcOpts).
 #
 # See Note [Stage number in build variables].
+#
+# -haddock is needed so the GHCi :doc command can find docs
+#   in the .hi-files for the ghc library
 GhcStage1HcOpts=
-GhcStage2HcOpts=-O2
-GhcStage3HcOpts=-O2
+GhcStage2HcOpts=-O2 -haddock
+GhcStage3HcOpts=-O2 -haddock
 
 
 # Note [Stage number in build variables].