[commit: ghc] wip/nfs-locking: Make quick and quickest flavours more precise (c27e8cb)

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

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

commit c27e8cbe776256e9698957c1c3dda4a62b185bbe
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jan 7 18:43:32 2017 +0000

    Make quick and quickest flavours more precise


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

c27e8cbe776256e9698957c1c3dda4a62b185bbe
 src/Settings/Flavours/Quick.hs    |  6 ++----
 src/Settings/Flavours/Quickest.hs | 13 +++++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Settings/Flavours/Quick.hs b/src/Settings/Flavours/Quick.hs
index 1e4f5c0..6935544 100644
--- a/src/Settings/Flavours/Quick.hs
+++ b/src/Settings/Flavours/Quick.hs
@@ -10,7 +10,8 @@ quickFlavour :: Flavour
 quickFlavour = defaultFlavour
     { name        = "quick"
     , args        = defaultBuilderArgs <> quickArgs <> defaultPackageArgs
-    , libraryWays = defaultLibraryWays <> quickLibraryWays }
+    , libraryWays = append [vanilla]
+    , rtsWays     = append [vanilla, threaded] }
 
 optimise :: Context -> Bool
 optimise Context {..} =
@@ -20,6 +21,3 @@ quickArgs :: Args
 quickArgs = builder Ghc ? do
     context <- getContext
     if optimise context then arg "-O" else arg "-O0"
-
-quickLibraryWays :: Ways
-quickLibraryWays = remove [profiling]
diff --git a/src/Settings/Flavours/Quickest.hs b/src/Settings/Flavours/Quickest.hs
index 9f95957..62ad43e 100644
--- a/src/Settings/Flavours/Quickest.hs
+++ b/src/Settings/Flavours/Quickest.hs
@@ -6,10 +6,15 @@ import {-# SOURCE #-} Settings.Default
 
 quickestFlavour :: Flavour
 quickestFlavour = defaultFlavour
-    { name        = "quickest"
-    , args        = defaultBuilderArgs <> quickestArgs <> defaultPackageArgs
-    , libraryWays = append [vanilla]
-    , rtsWays     = append [vanilla] }
+    { name         = "quickest"
+    , args         = defaultBuilderArgs <> quickestArgs <> defaultPackageArgs
+    , libraryWays  = append [vanilla]
+    , rtsWays      = quickestRtsWays }
 
 quickestArgs :: Args
 quickestArgs = builder Ghc ? arg "-O0"
+
+quickestRtsWays :: Ways
+quickestRtsWays = mconcat
+    [ append [vanilla]
+    , buildHaddock defaultFlavour ? append [threaded] ]