[commit: ghc] master: rules/haddock: Add EXTRA_HADDOCK_OPTS flag (e58a936)

[git at git.haskell.org]

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

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

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

commit e58a9361ac7e3699e298aa5c99398a21ac732500
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Dec 17 12:15:27 2015 +0100

    rules/haddock: Add EXTRA_HADDOCK_OPTS flag
    
    Allowing one to pass the new `--hyperlinked-source` option to generate
    pretty marked-up sources for the core libraries.
    
    Test Plan: Try it
    
    Reviewers: hvr, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1643


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

e58a9361ac7e3699e298aa5c99398a21ac732500
 rules/haddock.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/haddock.mk b/rules/haddock.mk
index f6978a7..3d3a83c 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -64,13 +64,14 @@ endif
 	  --hoogle \
 	  --title="$$($1_PACKAGE)-$$($1_$2_VERSION)$$(if $$(strip $$($1_$2_SYNOPSIS)),: $$(strip $$($1_$2_SYNOPSIS)),)" \
 	  --prologue="$1/$2/haddock-prologue.txt" \
-    --optghc="-D__HADDOCK_VERSION__=$$(HADDOCK_VERSION_STRING)" \
+	  --optghc="-D__HADDOCK_VERSION__=$$(HADDOCK_VERSION_STRING)" \
 	  $$(foreach mod,$$($1_$2_HIDDEN_MODULES),--hide=$$(mod)) \
 	  $$(foreach pkg,$$($1_$2_DEPS),$$(if $$($$(pkg)_HADDOCK_FILE),--read-interface=../$$(pkg)$$(comma)../$$(pkg)/src/%{MODULE/./-}.html\#%{NAME}$$(comma)$$($$(pkg)_HADDOCK_FILE))) \
 	  $$(foreach opt,$$($1_$2_$$(HADDOCK_WAY)_ALL_HC_OPTS),--optghc=$$(opt)) \
 	  $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS) \
 	  $$($1_$2_HS_SRCS) \
 	  $$($1_$2_EXTRA_HADDOCK_SRCS) \
+	  $$(EXTRA_HADDOCK_OPTS) \
 	  +RTS -t"$1/$2/haddock.t" --machine-readable
 
 # --no-tmp-comp-dir above is important: it saves a few minutes in a