[commit: ghc] wip/nfs-locking: Drop no longer relevant bits (1774b40)

[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/1774b40d0be398953bc0ad03bc364a951d971a7b/ghc

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

commit 1774b40d0be398953bc0ad03bc364a951d971a7b
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jan 8 02:56:18 2017 +0000

    Drop no longer relevant bits


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

1774b40d0be398953bc0ad03bc364a951d971a7b
 src/Flavour.hs                  |  6 +++++-
 src/Settings/Builders/Common.hs |  6 ++----
 src/UserSettings.hs             | 19 ++-----------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/Flavour.hs b/src/Flavour.hs
index b195767..3283eda 100644
--- a/src/Flavour.hs
+++ b/src/Flavour.hs
@@ -2,8 +2,12 @@ module Flavour (Flavour (..)) where
 
 import Expression
 
--- TODO: Merge {libraryWays, rtsWays}, and {dynamicGhcPrograms, ghcProfiled...}.
 -- | 'Flavour' is a collection of build settings that fully define a GHC build.
+-- Note the following type semantics:
+-- * @Bool@: a plain Boolean flag whose value is known at compile time.
+-- * @Action Bool@: a flag whose value can depend on the build environment.
+-- * @Predicate@: a flag whose value can depend on the build environment and
+-- on the current build target.
 data Flavour = Flavour
     { name               :: String    -- ^ Flavour name, to set from command line.
     , args               :: Args      -- ^ Use these command line arguments.
diff --git a/src/Settings/Builders/Common.hs b/src/Settings/Builders/Common.hs
index 271851e..a6b8198 100644
--- a/src/Settings/Builders/Common.hs
+++ b/src/Settings/Builders/Common.hs
@@ -41,16 +41,14 @@ cIncludeArgs = do
 ldArgs :: Args
 ldArgs = mempty
 
--- TODO: put all validating options together in one file
 cArgs :: Args
-cArgs = validating ? cWarnings
+cArgs = mempty
 
 -- TODO: should be in a different file
 cWarnings :: Args
 cWarnings = do
     let gccGe46 = notM $ (flag GccIsClang ||^ flag GccLt46)
-    mconcat [ turnWarningsIntoErrors ? arg "-Werror"
-            , arg "-Wall"
+    mconcat [ arg "-Wall"
             , flag GccIsClang ? arg "-Wno-unknown-pragmas"
             , gccGe46 ? notM windowsHost ? arg "-Werror=unused-but-set-variable"
             , gccGe46 ? arg "-Wno-error=inline" ]
diff --git a/src/UserSettings.hs b/src/UserSettings.hs
index e16cf49..09d70e1 100644
--- a/src/UserSettings.hs
+++ b/src/UserSettings.hs
@@ -3,8 +3,8 @@
 -- If you don't copy the file your changes will be tracked by git and you can
 -- accidentally commit them.
 module UserSettings (
-    buildRootPath, userFlavours, userKnownPackages, validating,
-    turnWarningsIntoErrors, verboseCommands, putBuild, putSuccess
+    buildRootPath, userFlavours, userKnownPackages, verboseCommands,
+    putBuild, putSuccess
     ) where
 
 import System.Console.ANSI
@@ -29,21 +29,6 @@ userFlavours = []
 userKnownPackages :: [Package]
 userKnownPackages = []
 
--- | User defined flags. Note the following type semantics:
--- * @Bool@: a plain Boolean flag whose value is known at compile time.
--- * @Action Bool@: a flag whose value can depend on the build environment.
--- * @Predicate@: a flag whose value can depend on the build environment and
--- on the current build target.
-
--- TODO: This should be set automatically when validating.
-validating :: Bool
-validating = False
-
--- TODO: Replace with stage2 ? arg "-Werror"? Also see #251.
--- | To enable -Werror in Stage2 set turnWarningsIntoErrors = stage2.
-turnWarningsIntoErrors :: Predicate
-turnWarningsIntoErrors = return False
-
 -- | Set to True to print full command lines during the build process. Note,
 -- this is a Predicate, hence you can enable verbose output only for certain
 -- targets, e.g.: @verboseCommands = package ghcPrim at .