Skip to content

Commit 3ad22e5

Browse files
committed
Recompute package registration AFTER we install (haskell#3257).
It needs to be done afterwards, because we need to compute the ABI hash as part of registration, which can't be done unless all dependencies are registered, which could include internal libraries. This whole affair is very dodgy. Signed-off-by: Edward Z. Yang <[email protected]>
1 parent c6bb444 commit 3ad22e5

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cabal-install/Distribution/Client/Install.hs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,9 +1462,6 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
14621462

14631463
-- Install phase
14641464
onFailure InstallFailed $ criticalSection installLock $ do
1465-
-- Capture installed package configuration file
1466-
maybePkgConf <- maybeGenPkgConf mLogPath
1467-
14681465
-- Actual installation
14691466
withWin32SelfUpgrade verbosity ipid configFlags
14701467
cinfo platform pkg $ do
@@ -1474,6 +1471,11 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
14741471
setup Cabal.copyCommand copyFlags mLogPath
14751472
when shouldRegister $ do
14761473
setup Cabal.registerCommand registerFlags mLogPath
1474+
1475+
-- Capture installed package configuration file
1476+
-- TODO: Why do we need this?
1477+
maybePkgConf <- maybeGenPkgConf mLogPath
1478+
14771479
return (Right (BuildOk docsResult testsResult maybePkgConf))
14781480

14791481
where

0 commit comments

Comments
 (0)