Commit 1ade8854 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Fix merge conflicts

parents 9b705686 0c67f7d2
...@@ -40,10 +40,11 @@ topLevelTargets = action $ do ...@@ -40,10 +40,11 @@ topLevelTargets = action $ do
libs <- concatForM [Stage0, Stage1] $ \stage -> libs <- concatForM [Stage0, Stage1] $ \stage ->
concatForM libraryPackages $ packageTargets stage concatForM libraryPackages $ packageTargets stage
prgs <- concatForM programsStage1Only $ packageTargets Stage0 prgs <- concatForM programsStage1Only $ packageTargets Stage0
return $ libs ++ prgs return $ libs ++ prgs ++ inplaceLibCopyTargets
else else do
concatForM allStages $ \stage -> targets <- concatForM allStages $ \stage ->
concatForM (knownPackages \\ [rts, libffi]) $ packageTargets stage concatForM (knownPackages \\ [rts, libffi]) $ packageTargets stage
return $ targets ++ inplaceLibCopyTargets
-- | Return the list of targets associated with a given 'Stage' and 'Package'. -- | Return the list of targets associated with a given 'Stage' and 'Package'.
packageTargets :: Stage -> Package -> Action [FilePath] packageTargets :: Stage -> Package -> Action [FilePath]
......
...@@ -25,8 +25,6 @@ buildProgram rs context@Context {..} = when (isProgram package) $ do ...@@ -25,8 +25,6 @@ buildProgram rs context@Context {..} = when (isProgram package) $ do
context' <- programContext stage package context' <- programContext stage package
buildBinaryAndWrapper rs context' bin buildBinaryAndWrapper rs context' bin
when (package == ghc) $ want inplaceLibCopyTargets
-- Rules for programs built in install directories -- Rules for programs built in install directories
when (stage == Stage0 || package == ghc) $ do when (stage == Stage0 || package == ghc) $ do
-- Some binaries in inplace/bin are wrapped -- Some binaries in inplace/bin are wrapped
......
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