[commit: ghc] wip/nfs-locking: Move -Wall before custom package settings, drop tab warnings (ab1c922)

[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/ab1c922d6531519e91ebed34b47070ba6fdc4170/ghc

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

commit ab1c922d6531519e91ebed34b47070ba6fdc4170
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Jan 6 16:34:21 2017 +0000

    Move -Wall before custom package settings, drop tab warnings
    
    See #296


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

ab1c922d6531519e91ebed34b47070ba6fdc4170
 src/Settings/Builders/Ghc.hs | 5 ++---
 src/Settings/Default.hs      | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Settings/Builders/Ghc.hs b/src/Settings/Builders/Ghc.hs
index f5b13e1..98e5e39 100644
--- a/src/Settings/Builders/Ghc.hs
+++ b/src/Settings/Builders/Ghc.hs
@@ -7,12 +7,11 @@ import Settings.Builders.Common
 ghcBuilderArgs :: Args
 ghcBuilderArgs = (builder (Ghc CompileHs) ||^ builder (Ghc LinkHs)) ? do
     needTouchy
-    mconcat [ commonGhcArgs
+    mconcat [ arg "-Wall"
+            , commonGhcArgs
             , arg "-H32m"
             , stage0    ? arg "-O"
             , notStage0 ? arg "-O2"
-            , arg "-Wall"
-            , arg "-fwarn-tabs"
             , splitObjectsArgs
             , ghcLinkArgs
             , builder (Ghc CompileHs) ? arg "-c"
diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
index 67b0d5d..061d4ae 100644
--- a/src/Settings/Default.hs
+++ b/src/Settings/Default.hs
@@ -41,10 +41,7 @@ import UserSettings
 
 -- | All default command line arguments.
 defaultArgs :: Args
-defaultArgs = mconcat
-    [ defaultBuilderArgs
-    , defaultPackageArgs
-    , builder Ghc ? remove ["-Wall", "-fwarn-tabs"] ] -- TODO: Fix warning Args.
+defaultArgs = defaultBuilderArgs <> defaultPackageArgs
 
 -- | Packages that are built by default. You can change this by editing
 -- 'userPackages' in "UserSettings".