Unverified Commit 2683445c authored by Andrey Mokhov's avatar Andrey Mokhov Committed by GitHub
Browse files

Fix Windows build (#563)

Fix copyFile failure on Windows plus minor revision
parent 3465caf8
...@@ -13,7 +13,7 @@ data HaddockMode = BuildPackage | BuildIndex ...@@ -13,7 +13,7 @@ data HaddockMode = BuildPackage | BuildIndex
data Builder = Alex data Builder = Alex
| Ar ArMode Stage | Ar ArMode Stage
| Autoreconf FilePath | Autoreconf FilePath
| DeriveConstants | DeriveConstants
| Cc CcMode Stage | Cc CcMode Stage
| Configure FilePath | Configure FilePath
......
This diff is collapsed.
...@@ -41,7 +41,6 @@ registerPackages rs context@Context {..} = do ...@@ -41,7 +41,6 @@ registerPackages rs context@Context {..} = do
Stage0 | pkg `notElem` bootLibs -> copyConf rs (context { package = pkg }) conf Stage0 | pkg `notElem` bootLibs -> copyConf rs (context { package = pkg }) conf
_ -> buildConf rs (context { package = pkg }) conf _ -> buildConf rs (context { package = pkg }) conf
buildConf :: [(Resource, Int)] -> Context -> FilePath -> Action () buildConf :: [(Resource, Int)] -> Context -> FilePath -> Action ()
buildConf _ context@Context {..} _conf = do buildConf _ context@Context {..} _conf = do
depPkgIds <- cabalDependencies context depPkgIds <- cabalDependencies context
...@@ -49,7 +48,7 @@ buildConf _ context@Context {..} _conf = do ...@@ -49,7 +48,7 @@ buildConf _ context@Context {..} _conf = do
-- setup-config, triggers `ghc-cabal configure` -- setup-config, triggers `ghc-cabal configure`
-- everything of a package should depend on that -- everything of a package should depend on that
-- in the first place. -- in the first place.
setupConfig <- (contextPath context) <&> (-/- "setup-config") setupConfig <- contextPath context <&> (-/- "setup-config")
need [setupConfig] need [setupConfig]
need =<< mapM (\pkgId -> packageDbPath stage <&> (-/- pkgId <.> "conf")) depPkgIds need =<< mapM (\pkgId -> packageDbPath stage <&> (-/- pkgId <.> "conf")) depPkgIds
......
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