[commit: ghc] wip/nfs-locking: Minor changes and comments. (640b38f)

[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/640b38fbd3857a6c72156f81bd4ba06b8af61ae2/ghc

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

commit 640b38fbd3857a6c72156f81bd4ba06b8af61ae2
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jan 4 03:35:36 2015 +0000

    Minor changes and comments.


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

640b38fbd3857a6c72156f81bd4ba06b8af61ae2
 src/Base.hs    |  2 +-
 src/Package.hs | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Base.hs b/src/Base.hs
index 490c031..ea9980c 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -7,7 +7,7 @@ module Base (
     module Data.Monoid,
     module Data.List,
     Stage (..),
-    Args, arg, args, ShowAction (..), Collect (..),
+    Args, arg, args, ShowAction (..),
     Condition (..),
     joinArgs, joinArgsSpaced, splitArgs,
     filterOut
diff --git a/src/Package.hs b/src/Package.hs
index 5d6fc1e..843f34f 100644
--- a/src/Package.hs
+++ b/src/Package.hs
@@ -230,14 +230,14 @@ buildPackageDeps pkg @ (Package name path _) (stage, dist, settings) =
             return $ path </> dir </> modPath <.> extension
         packageKey <- packagaDataOption pkgData PackageKey
         run (Ghc stage) $ mconcat
-            [ arg ["-M"]
+            [ arg "-M"
             , wayHcOpts vanilla -- TODO: i) is this needed? ii) shall we run GHC -M multiple times?
-            , splitArgs $ arg [SrcHcOpts]
-            , when (stage == Stage0) $ arg ["-package-db libraries/bootstrapping.conf"]
-            , arg [if usePackageKey then "-this-package-key" else "-package-name"]
-            , arg [packageKey] -- TODO: check reasoning ($$($4_THIS_PACKAGE_KEY) $$($1_$2_PACKAGE_KEY))
-            , arg ["-hide-all-packages"]
-            , arg ["-i"] -- resets the search path to nothing; TODO: check if really needed
+            , splitArgs $ arg SrcHcOpts -- TODO: get rid of splitArgs
+            , when (stage == Stage0) $ arg "-package-db libraries/bootstrapping.conf"
+            , arg $ if usePackageKey then "-this-package-key" else "-package-name"
+            , arg packageKey -- TODO: check reasoning ($$($4_THIS_PACKAGE_KEY) $$($1_$2_PACKAGE_KEY))
+            , arg "-hide-all-packages"
+            , arg "-i" -- resets the search path to nothing; TODO: check if really needed
             , arg $ map (\d -> "-i" ++ path </> d) srcDirs
             , arg $ do
                 prefix <- ["-i", "-I"] -- 'import' and '#include' search paths
@@ -245,8 +245,8 @@ buildPackageDeps pkg @ (Package name path _) (stage, dist, settings) =
                 return $ prefix ++ buildDir </> suffix
             , arg $ map (\d -> "-I" ++ path </> d) $ filter isRelative includeDirs
             , arg $ map (\d -> "-I" ++          d) $ filter isAbsolute includeDirs
-            , arg ["-optP-include"]
-            , arg ["-optP" ++ buildDir </> "build/autogen/cabal_macros.h"]
+            , arg "-optP-include"
+            , arg $ "-optP" ++ buildDir </> "build/autogen/cabal_macros.h"
             , if usePackageKey 
               then arg $ concatMap (\d -> ["-package-key", d]) depKeys
               else arg $ concatMap (\d -> ["-package"    , d]) deps