Merge pull request #6827 from commercialhaskell/fix6826

mpilgrem · web-flow · commit 9b0bbd0946d3 · 2025-12-20T00:01:07.000Z
Fix #6826 Ignore the `mainLibraryHasExposedModules package` test
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -22,6 +22,8 @@ Behavior changes:
 * When building GHC from source, on Windows, the default Hadrian build target is
   `reloc-binary-dist` and the default path to the GHC built by Hadrian is
   `_build/reloc-bindist`.
+* Stack's `haddock` command no longer requires a package to have a main library
+  that exposes modules.
 
 Other enhancements:
 
diff --git a/doc/commands/build_command.md b/doc/commands/build_command.md
@@ -348,11 +348,6 @@ sets this flag.
 Stack applies Haddock's `--gen-contents` and `--gen-index` flags to generate a
 single HTML contents and index for multiple sets of Haddock documentation.
 
-!!! note
-
-    If a package does not have a main library that exposes modules, Haddock
-    documentation will not be built for that package, irrespective of the flag.
-
 !!! warning
 
     On Windows, the values for the `haddock-interfaces` and `haddock-html` keys
diff --git a/src/Stack/Build/ExecutePackage.hs b/src/Stack/Build/ExecutePackage.hs
@@ -82,7 +82,7 @@ import           Stack.Coverage ( generateHpcReport, updateTixFile )
 import           Stack.GhcPkg ( ghcPkg, ghcPkgPathEnvVar, unregisterGhcPkgIds )
 import           Stack.Package
                    ( buildLogPath, buildableExes, buildableSubLibs
-                   , hasBuildableMainLibrary, mainLibraryHasExposedModules
+                   , hasBuildableMainLibrary
                    )
 import           Stack.PackageDump ( conduitDumpPackage, ghcPkgDescribe )
 import           Stack.Prelude
@@ -347,8 +347,10 @@ announceTask ee taskType action = logInfo $
 
 -- | Implements running a package's build, used to implement
 -- 'Control.Concurrent.Execute.ATBuild' and
--- 'Control.Concurrent.Execute.ATBuildFinal' tasks. In particular this does the
--- following:
+-- 'Control.Concurrent.Execute.ATBuildFinal' tasks. The latter is a task for
+-- building a package's benchmarks and test-suites.
+--
+-- In particular this does the following:
 --
 -- * Checks if the package exists in the precompiled cache, and if so, add it to
 --   the database instead of performing the build.
@@ -471,12 +473,9 @@ realConfigAndBuild
  where
   pkgId = taskProvides task
   PackageIdentifier pname _ = pkgId
-  doHaddock curator package =
+  doHaddock curator =
        task.buildHaddocks
     && not isFinalBuild
-       -- Works around haddock failing on bytestring-builder since it has no
-       -- modules when bytestring is new enough.
-    && mainLibraryHasExposedModules package
        -- Special help for the curator tool to avoid haddocks that are known
        -- to fail
     && maybe True (Set.notMember pname . (.skipHaddock)) curator
@@ -593,7 +592,7 @@ realConfigAndBuild
     postBuildCheck True
 
     mcurator <- view $ buildConfigL . to (.curator)
-    when (doHaddock mcurator package) $ do
+    when (doHaddock mcurator) $ do
       let isTaskTargetMutable = taskTargetIsMutable task == Mutable
           isHaddockForHackage =
             ee.buildOpts.haddockForHackage && isTaskTargetMutable
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -23,7 +23,6 @@ module Stack.Package
   , packageDependencies
   , applyForceCustomBuild
   , hasBuildableMainLibrary
-  , mainLibraryHasExposedModules
   , packageUnknownTools
   , buildableForeignLibs
   , buildableSubLibs
@@ -651,15 +650,6 @@ hasBuildableMainLibrary :: Package -> Bool
 hasBuildableMainLibrary package =
   maybe False isComponentBuildable package.library
 
--- | Check if the main library has any exposed modules.
---
--- This should become irrelevant at some point since there's nothing inherently
--- wrong or different with packages exposing only modules in internal libraries
--- (for instance).
-mainLibraryHasExposedModules :: Package -> Bool
-mainLibraryHasExposedModules package =
-  maybe False (not . null . (.exposedModules)) package.library
-
 -- | Aggregate all unknown tools from all components. Mostly meant for
 -- build tools specified in the legacy manner (build-tools:) that failed the
 -- hard-coded lookup. See 'Stack.Types.Component.unknownTools' for more
