Successive Cabal Package Errors

Cabal/src/Distribution/PackageDescription/Check.hs

@@ -309,7 +309,7 @@ ppExplanation SignaturesCabal2 =
   "To use the 'signatures' field the package needs to specify "
     ++ "at least 'cabal-version: 2.0'."
 ppExplanation AutogenNotExposed =
-  "An 'autogen-module' is neither on 'exposed-modules' or 'other-modules'."
+  "An 'autogen-module' is neither on 'exposed-modules' nor 'other-modules'."
 ppExplanation AutogenIncludesNotIncluded =
   "An include in 'autogen-includes' is neither in 'includes' or "
     ++ "'install-includes'."

Cabal/src/Distribution/Simple.hs

@@ -92,6 +92,7 @@ import Distribution.Pretty
 import Distribution.Simple.Bench
 import Distribution.Simple.BuildPaths
 import Distribution.Simple.ConfigureScript
+import Distribution.Simple.Errors
 import Distribution.Simple.Haddock
 import Distribution.Simple.Install
 import Distribution.Simple.LocalBuildInfo
@@ -601,16 +602,10 @@ sanityCheckHookedBuildInfo
   verbosity
   (PackageDescription{library = Nothing})
   (Just _, _) =
-    die' verbosity $
-      "The buildinfo contains info for a library, "
-        ++ "but the package does not have a library."
+    dieWithException verbosity $ NoLibraryForPackage
 sanityCheckHookedBuildInfo verbosity pkg_descr (_, hookExes)
   | exe1 : _ <- nonExistant =
-      die' verbosity $
-        "The buildinfo contains info for an executable called '"
-          ++ prettyShow exe1
-          ++ "' but the package does not have a "
-          ++ "executable with that name."
+      dieWithException verbosity $ SanityCheckHookedBuildInfo exe1
   where
     pkgExeNames = nub (map exeName (executables pkg_descr))
     hookExeNames = nub (map fst hookExes)
@@ -777,7 +772,7 @@ autoconfUserHooks =
               verbosity
               flags
               lbi
-          else die' verbosity "configure script not found."
+          else dieWithException verbosity ConfigureScriptNotFound
 
         pbi <- getHookedBuildInfo verbosity (buildDir lbi)
         sanityCheckHookedBuildInfo verbosity pkg_descr pbi

Cabal/src/Distribution/Simple/Build.hs

@@ -181,9 +181,7 @@ checkSemaphoreSupport
   :: Verbosity -> Compiler -> BuildFlags -> IO ()
 checkSemaphoreSupport verbosity comp flags = do
   unless (jsemSupported comp || (isNothing (flagToMaybe (buildUseSemaphore flags)))) $
-    die' verbosity $
-      "Your compiler does not support the -jsem flag. "
-        ++ "To use this feature you must use GHC 9.8 or later."
+    dieWithException verbosity CheckSemaphoreSupport
 
 -- | Write available build information for 'LocalBuildInfo' to disk.
 --