Skip to content

Commit

Permalink
Allow arguments to be passed to Setup.hs haddock for `build-type:co…
Browse files Browse the repository at this point in the history
…nfigure`

In the course of 4466310 (see #5526) the
`Setup.hs haddock` CLI was extended to allow component ids to be passed
as positional arguments. However, `autoconfUserHooks` which is used in
case of `build-type: Configure` wasn't updated accordingly, and consequently
this caused `new-haddock` to break for packages using `Configure`.

cc @alexbiehl

Fixes #5503

(cherry picked from commit 86dabda)
  • Loading branch information
hvr committed Sep 8, 2018
1 parent b00d215 commit 3d2b9d0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Cabal/Distribution/Simple.hs
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ autoconfUserHooks
preClean = readHook cleanVerbosity cleanDistPref,
preInst = readHook installVerbosity installDistPref,
preHscolour = readHook hscolourVerbosity hscolourDistPref,
preHaddock = readHook haddockVerbosity haddockDistPref,
preHaddock = readHookWithArgs haddockVerbosity haddockDistPref,
preReg = readHook regVerbosity regDistPref,
preUnreg = readHook regVerbosity regDistPref
}
Expand Down

0 comments on commit 3d2b9d0

Please sign in to comment.