[commit: ghc] wip/nfs-locking: Base: Don't reexport Development.Shake.Util (062e6b2)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:18:59 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/062e6b2ad5dc4be679f14f9b5a8ecbd99febc54b/ghc

>---------------------------------------------------------------

commit 062e6b2ad5dc4be679f14f9b5a8ecbd99febc54b
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 24 14:38:53 2015 +0100

    Base: Don't reexport Development.Shake.Util


>---------------------------------------------------------------

062e6b2ad5dc4be679f14f9b5a8ecbd99febc54b
 src/Base.hs               | 2 --
 src/Rules/Dependencies.hs | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Base.hs b/src/Base.hs
index 1012d4e..25a69df 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -12,7 +12,6 @@ module Base (
     module Development.Shake,
     module Development.Shake.Classes,
     module Development.Shake.FilePath,
-    module Development.Shake.Util,
 
     -- * Paths
     shakeFilesPath, configPath, sourcePath, programInplacePath,
@@ -38,7 +37,6 @@ import Data.Monoid
 import Development.Shake hiding (unit, (*>), parallel)
 import Development.Shake.Classes
 import Development.Shake.FilePath
-import Development.Shake.Util
 import System.Console.ANSI
 import qualified System.Directory as IO
 import System.IO
diff --git a/src/Rules/Dependencies.hs b/src/Rules/Dependencies.hs
index a2f5aa2..88e97b2 100644
--- a/src/Rules/Dependencies.hs
+++ b/src/Rules/Dependencies.hs
@@ -7,6 +7,7 @@ import Rules.Actions
 import Rules.Generate
 import Rules.Resources
 import Settings
+import Development.Shake.Util (parseMakefile)
 
 buildPackageDependencies :: Resources -> PartialTarget -> Rules ()
 buildPackageDependencies _ target @ (PartialTarget stage pkg) =



More information about the ghc-commits mailing list