Commit e2fb9543 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Don't re-initialise packageConfiguration in Stage2, see #66.

parent 84704cf2
......@@ -72,9 +72,11 @@ packageConfiguration :: Stage -> FilePath
packageConfiguration Stage0 = "libraries/bootstrapping.conf"
packageConfiguration _ = "inplace/lib/package.conf.d"
-- StageN, N > 0, share the same packageConfiguration (see above)
packageConfigurationInitialised :: Stage -> FilePath
packageConfigurationInitialised stage =
shakeFilesPath -/- "package-configuration-initialised-" ++ stageString stage
shakeFilesPath -/- "package-configuration-initialised-"
++ stageString (min stage Stage1)
-- Utility functions
-- | Find and replace all occurrences of a value in a list
......
......@@ -42,7 +42,7 @@ cabalRules = do
-- When the file exists, the packageConfiguration has been initialised
-- TODO: get rid of an extra file?
forM_ [Stage0 ..] $ \stage ->
forM_ [Stage0, Stage1] $ \stage ->
packageConfigurationInitialised stage %> \out -> do
let target = PartialTarget stage cabal
pkgConf = packageConfiguration stage
......
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