[commit: ghc] wip/nfs-locking: Untrack copied artifacts (#365) (6395cf5)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:52:04 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/6395cf549921934602563cfae645e6707b171fac/ghc
>---------------------------------------------------------------
commit 6395cf549921934602563cfae645e6707b171fac
Author: Zhen Zhang <izgzhen at gmail.com>
Date: Tue Jul 18 05:26:00 2017 +0800
Untrack copied artifacts (#365)
>---------------------------------------------------------------
6395cf549921934602563cfae645e6707b171fac
src/Rules/Install.hs | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/Rules/Install.hs b/src/Rules/Install.hs
index 57cf008..058e160 100644
--- a/src/Rules/Install.hs
+++ b/src/Rules/Install.hs
@@ -194,22 +194,17 @@ installPackages = do
need [ ghcCabalInplace ]
let cabalFile = pkgCabalFile pkg
- -- HsColour sources
- -- QUESTION: what is the output of GhcCabalHsColour?
- whenM (isSpecified HsColour) $ do
- top <- interpretInContext context getTopDirectory
- let installDistDir = top -/- buildPath context
- -- HACK: copy stuff back to the place favored by ghc-cabal
- quietly $ copyDirectoryContents (Not excluded)
- installDistDir (installDistDir -/- "build")
pkgConf <- pkgConfFile context
need [ cabalFile, pkgConf ] -- TODO: check if need pkgConf
- build $ Target context GhcCabalHsColour [cabalFile] []
-- HACK (#318): copy stuff back to the place favored by ghc-cabal
quietly $ copyDirectoryContents (Not excluded)
installDistDir (installDistDir -/- "build")
+
+ whenM (isSpecified HsColour) $
+ build $ Target context GhcCabalHsColour [cabalFile] []
+
pref <- setting InstallPrefix
unit $ cmd ghcCabalInplace
[ "copy"
More information about the ghc-commits
mailing list