Merge pull request #6137 from haskell/issue-5977

Issue 5977

(cherry picked from commit 0d2d9ca)

cabal-install/Distribution/Client/CmdHaddock.hs

@@ -74,7 +74,7 @@ haddockAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags, TestFl
 haddockAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags)
                 targetStrings globalFlags = do
 
-    baseCtx <- establishProjectBaseContext verbosity cliConfig OtherCommand
+    baseCtx <- establishProjectBaseContext verbosity cliConfig HaddockCommand
 
     targetSelectors <- either (reportTargetSelectorProblems verbosity) return
                    =<< readTargetSelectors (localPackages baseCtx) Nothing targetStrings

cabal-install/Distribution/Client/ProjectOrchestration.hs

@@ -171,7 +171,7 @@ import           System.Posix.Signals (sigKILL, sigSEGV)
 
 -- | Tracks what command is being executed, because we need to hide this somewhere
 -- for cases that need special handling (usually for error reporting).
-data CurrentCommand = InstallCommand | OtherCommand
+data CurrentCommand = InstallCommand | HaddockCommand | OtherCommand
                     deriving (Show, Eq)
 
 -- | This holds the context of a project prior to solving: the content of the
@@ -431,7 +431,7 @@ runProjectPostBuildPhase verbosity
 
     -- Finally if there were any build failures then report them and throw
     -- an exception to terminate the program
-    dieOnBuildFailures verbosity currentCommand elaboratedPlanToExecute buildOutcomes 
+    dieOnBuildFailures verbosity currentCommand elaboratedPlanToExecute buildOutcomes
 
     -- Note that it is a deliberate design choice that the 'buildTargets' is
     -- not passed to phase 1, and the various bits of input config is not
@@ -1030,6 +1030,7 @@ dieOnBuildFailures verbosity currentCommand plan buildOutcomes
       ]
 
     dieIfNotHaddockFailure
+      | currentCommand == HaddockCommand            = die'
       | all isHaddockFailure failuresClassification = warn
       | otherwise                                   = die'
       where

cabal-testsuite/PackageTests/NewHaddock/Fails/Example.hs

@@ -0,0 +1,6 @@
+module Example where
+
+import Prelude
+
+example :: Int
+example = False

cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out

@@ -0,0 +1,15 @@
+# cabal v2-build
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - example-1.0 (lib) (first run)
+Configuring library for example-1.0..
+Preprocessing library for example-1.0..
+Building library for example-1.0..
+# cabal v2-haddock
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - example-1.0 (lib) (first run)
+Preprocessing library for example-1.0..
+Running Haddock on library for example-1.0..
+cabal: Failed to build documentation for example-1.0-inplace.

cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.project

@@ -0,0 +1 @@
+packages: .

cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.test.hs

@@ -0,0 +1,6 @@
+import Test.Cabal.Prelude
+import System.Exit (ExitCode (..))
+
+main = cabalTest $ do
+    fails $ cabal "v2-build" ["example"]
+    fails $ cabal "v2-haddock" ["example"]

cabal-testsuite/PackageTests/NewHaddock/Fails/example.cabal

@@ -0,0 +1,9 @@
+name:          example
+version:       1.0
+build-type:    Simple
+cabal-version: >=1.10
+
+library
+  default-language: Haskell2010
+  build-depends:    base
+  exposed-modules:  Example