[commit: ghc] wip/nfs-locking: Clean up. (86b0a17)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:00:20 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/86b0a17ad6fab8c9dde6f082b291c2d785f957d0/ghc
>---------------------------------------------------------------
commit 86b0a17ad6fab8c9dde6f082b291c2d785f957d0
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Fri Jul 24 04:12:31 2015 +0100
Clean up.
>---------------------------------------------------------------
86b0a17ad6fab8c9dde6f082b291c2d785f957d0
src/Package.hs | 1 -
src/Rules/Data.hs | 1 -
src/Settings/GhcPkg.hs | 2 +-
src/Util.hs | 1 +
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/Package.hs b/src/Package.hs
index 5d2429f..a007b4e 100644
--- a/src/Package.hs
+++ b/src/Package.hs
@@ -6,7 +6,6 @@ import Util
import Data.Function
import GHC.Generics
import Development.Shake.Classes
-import Development.Shake.FilePath
-- pkgPath is the path to the source code relative to the root
data Package = Package
diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index 3ce7d08..2a2a995 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -16,7 +16,6 @@ import Rules.Actions
import Control.Applicative
import Control.Monad.Extra
import Development.Shake
-import Development.Shake.FilePath
-- Build package-data.mk by using GhcCabal to process pkgCabal file
buildPackageData :: StagePackageTarget -> Rules ()
diff --git a/src/Settings/GhcPkg.hs b/src/Settings/GhcPkg.hs
index 83bef1d..8e3a287 100644
--- a/src/Settings/GhcPkg.hs
+++ b/src/Settings/GhcPkg.hs
@@ -12,8 +12,8 @@ import Development.Shake.FilePath
ghcPkgArgs :: Args
ghcPkgArgs = do
- pkg <- asks getPackage
stage <- asks getStage
+ pkg <- asks getPackage
builder (GhcPkg stage) ? mconcat
[ arg "update"
, arg "--force"
diff --git a/src/Util.hs b/src/Util.hs
index 4b1a2c6..7cc38ee 100644
--- a/src/Util.hs
+++ b/src/Util.hs
@@ -1,6 +1,7 @@
module Util (
module Data.Char,
module System.Console.ANSI,
+ module Development.Shake.FilePath,
replaceIf, replaceEq, replaceSeparators,
unifyPath,
chunksOfSize,
More information about the ghc-commits
mailing list