[commit: ghc] wip/nfs-locking: Clean up. (14a236b)

[git at git.haskell.org]

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

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

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

commit 14a236b420ac7a03ef68b6a193efe10936dc10b8
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Feb 9 22:25:30 2015 +0000

    Clean up.


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

14a236b420ac7a03ef68b6a193efe10936dc10b8
 src/Base.hs         | 2 --
 src/Oracles/Flag.hs | 2 +-
 src/Package/Base.hs | 2 ++
 src/Targets.hs      | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Base.hs b/src/Base.hs
index 923e13d..fa9104a 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -7,7 +7,6 @@ module Base (
     module Data.Function,
     module Data.Monoid,
     module Data.List,
-    module Settings,
     Stage (..),
     Arg, Args,
     ShowArg (..), ShowArgs (..),
@@ -23,7 +22,6 @@ import Control.Applicative
 import Data.Function
 import Data.Monoid
 import Data.List
-import Settings
 
 data Stage = Stage0 | Stage1 | Stage2 | Stage3 deriving (Eq, Enum)
 
diff --git a/src/Oracles/Flag.hs b/src/Oracles/Flag.hs
index fa29415..8149619 100644
--- a/src/Oracles/Flag.hs
+++ b/src/Oracles/Flag.hs
@@ -7,9 +7,9 @@ module Oracles.Flag (
     test, when, unless, not, (&&), (||)
     ) where
 
-import Control.Monad hiding (when, unless)
 import qualified Prelude
 import Prelude hiding (not, (&&), (||))
+import Control.Monad hiding (when, unless)
 import Base
 import Util
 import Oracles.Base
diff --git a/src/Package/Base.hs b/src/Package/Base.hs
index 2738b83..40d893e 100644
--- a/src/Package/Base.hs
+++ b/src/Package/Base.hs
@@ -4,6 +4,7 @@ module Package.Base (
     module Ways,
     module Util,
     module Oracles,
+    module Settings,
     Package (..), Settings (..), TodoItem (..),
     defaultSettings, library, customise, updateSettings,
     commonCcArgs, commonLdArgs, commonCppArgs, commonCcWarninigArgs,
@@ -20,6 +21,7 @@ import Base
 import Ways
 import Util
 import Oracles
+import Settings
 import qualified System.Directory as S
 
 data Settings = Settings
diff --git a/src/Targets.hs b/src/Targets.hs
index 19cb664..bdfb2ee 100644
--- a/src/Targets.hs
+++ b/src/Targets.hs
@@ -5,9 +5,6 @@ module Targets (
 
 import Package.Base
 
-integerLibraryName :: String
-integerLibraryName = show integerLibrary
-
 -- These are the packages we build:
 -- TODO: this should eventually be removed and replaced by the top-level
 -- target, i.e. GHC (and perhaps, something else)