From e1699ce67029b5667471cbf11ac6bca40c8a487b Mon Sep 17 00:00:00 2001
From: Fendor <power.walross@gmail.com>
Date: Mon, 30 Aug 2021 13:25:47 +0200
Subject: [PATCH] Always write build-info, even before building
---
Cabal/src/Distribution/Simple/Build.hs | 34 ++++++++++++++------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/Cabal/src/Distribution/Simple/Build.hs b/Cabal/src/Distribution/Simple/Build.hs
index 78bf79feae..6d7b2115d6 100644
--- a/Cabal/src/Distribution/Simple/Build.hs
+++ b/Cabal/src/Distribution/Simple/Build.hs
@@ -114,21 +114,9 @@ build pkg_descr lbi flags suffixes = do
internalPackageDB <- createInternalPackageDB verbosity lbi distPref
- (\f -> foldM_ f (installedPkgs lbi) componentsToBuild) $ \index target -> do
- let comp = targetComponent target
- clbi = targetCLBI target
- componentInitialBuildSteps distPref pkg_descr lbi clbi verbosity
- let bi = componentBuildInfo comp
- progs' = addInternalBuildTools pkg_descr lbi bi (withPrograms lbi)
- lbi' = lbi {
- withPrograms = progs',
- withPackageDB = withPackageDB lbi ++ [internalPackageDB],
- installedPkgs = index
- }
- mb_ipi <- buildComponent verbosity (buildNumJobs flags) pkg_descr
- lbi' suffixes comp clbi distPref
- return (maybe index (Index.insert `flip` index) mb_ipi)
-
+ -- Before the actual building, dump out build-information.
+ -- This way, if the actual compilation failed, the options have still been
+ -- dumped.
when shouldDumpBuildInfo $ do
-- Changing this line might break consumers of the dumped build info.
-- Announce changes on mailing lists!
@@ -150,6 +138,22 @@ build pkg_descr lbi flags suffixes = do
exists <- doesFileExist (buildInfoPref distPref)
when exists $ removeFile (buildInfoPref distPref)
+ -- Now do the actual building
+ (\f -> foldM_ f (installedPkgs lbi) componentsToBuild) $ \index target -> do
+ let comp = targetComponent target
+ clbi = targetCLBI target
+ componentInitialBuildSteps distPref pkg_descr lbi clbi verbosity
+ let bi = componentBuildInfo comp
+ progs' = addInternalBuildTools pkg_descr lbi bi (withPrograms lbi)
+ lbi' = lbi {
+ withPrograms = progs',
+ withPackageDB = withPackageDB lbi ++ [internalPackageDB],
+ installedPkgs = index
+ }
+ mb_ipi <- buildComponent verbosity (buildNumJobs flags) pkg_descr
+ lbi' suffixes comp clbi distPref
+ return (maybe index (Index.insert `flip` index) mb_ipi)
+
return ()
where
distPref = fromFlag (buildDistPref flags)
--
GitLab