Skip to content

Commit

Permalink
Avoid src dir pollution from haddock #2429
Browse files Browse the repository at this point in the history
  • Loading branch information
mgsloan committed Aug 9, 2016
1 parent 379c7fd commit 49d96c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ Bug fixes:
[#2252](https://github.com/commercialhaskell/stack/issues/2252)
* Ignore special entries when unpacking tarballs
[#2361](https://github.com/commercialhaskell/stack/issues/2361)
* Fixes src directory pollution of `style.css` and `highlight.js` with GHC 8's
haddock [#2429](https://github.com/commercialhaskell/stack/issues/2429)

## 1.1.2

Expand Down
3 changes: 2 additions & 1 deletion src/Stack/Build/Execute.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,8 @@ singleBuild runInBase ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} in
when (doHaddock package) $ do
announce "haddock"
sourceFlag <- do
hyped <- tryProcessStdout Nothing eeEnvOverride "haddock" ["--hyperlinked-source"]
-- See #2429 for why the temp dir is used
hyped <- tryProcessStdout (Just eeTempDir) eeEnvOverride "haddock" ["--hyperlinked-source"]
case hyped of
-- Fancy crosslinked source
Right _ -> do
Expand Down

0 comments on commit 49d96c9

Please sign in to comment.