Fix haddock executable name

commercialhaskell · Aug 18, 2015 · e20ea86 · e20ea86
1 parent 603c791
commit e20ea86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Stack/Build/Haddock.hs b/src/Stack/Build/Haddock.hs
@@ -203,7 +203,7 @@ generateHaddockIndex descr envOverride wc packageIDs docRelDir destDir = do
                    readProcessNull
                        (Just destDir)
                        envOverride
-                       (compilerExeName wc)
+                       (haddockExeName wc)
                        (["--gen-contents", "--gen-index"] ++ concatMap fst interfaceOpts)
   where
     toInterfaceOpt pid@(PackageIdentifier name _) = do

diff --git a/src/Stack/Types/Compiler.hs b/src/Stack/Types/Compiler.hs
@@ -75,3 +75,7 @@ isWantedCompiler _ _ _ = False
 compilerExeName :: WhichCompiler -> String
 compilerExeName Ghc = "ghc"
 compilerExeName Ghcjs = "ghcjs"
+
+haddockExeName :: WhichCompiler -> String
+haddockExeName Ghc = "haddock"
+haddockExeName Ghcjs = "haddock-ghcjs"