Commit ca43460d authored by Edward Z. Yang's avatar Edward Z. Yang
Browse files

Recompute package registration AFTER we install (#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: default avatarEdward Z. Yang <ezyang@cs.stanford.edu>
parent ec95c2db
......@@ -1462,9 +1462,6 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
-- Install phase
onFailure InstallFailed $ criticalSection installLock $ do
-- Capture installed package configuration file
maybePkgConf <- maybeGenPkgConf mLogPath
-- Actual installation
withWin32SelfUpgrade verbosity ipid configFlags
cinfo platform pkg $ do
......@@ -1474,6 +1471,11 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
setup Cabal.copyCommand copyFlags mLogPath
when shouldRegister $ do
setup Cabal.registerCommand registerFlags mLogPath
-- Capture installed package configuration file
-- TODO: Why do we need this?
maybePkgConf <- maybeGenPkgConf mLogPath
return (Right (BuildOk docsResult testsResult maybePkgConf))
where
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment