[commit: ghc] wip/nfs-locking: Minor revision (12aa4ef)

[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/12aa4ef0c4e6f8e0a89f2aa899d66a42ac2e3eb9/ghc

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

commit 12aa4ef0c4e6f8e0a89f2aa899d66a42ac2e3eb9
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jan 7 22:40:55 2017 +0000

    Minor revision


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

12aa4ef0c4e6f8e0a89f2aa899d66a42ac2e3eb9
 src/Settings/Default.hs           | 1 -
 src/Settings/Flavours/Quick.hs    | 3 +--
 src/Settings/Flavours/Quickest.hs | 8 ++++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
index 061d4ae..92089ab 100644
--- a/src/Settings/Default.hs
+++ b/src/Settings/Default.hs
@@ -118,7 +118,6 @@ stage2Packages = do
              , ghcTags       ] ++
              [ haddock | doc ]
 
--- TODO: What about profilingDynamic way? Do we need platformSupportsSharedLibs?
 -- | Default build ways for library packages:
 -- * We always build 'vanilla' way.
 -- * We build 'profiling' way when stage > Stage0.
diff --git a/src/Settings/Flavours/Quick.hs b/src/Settings/Flavours/Quick.hs
index 6935544..324ec85 100644
--- a/src/Settings/Flavours/Quick.hs
+++ b/src/Settings/Flavours/Quick.hs
@@ -10,8 +10,7 @@ quickFlavour :: Flavour
 quickFlavour = defaultFlavour
     { name        = "quick"
     , args        = defaultBuilderArgs <> quickArgs <> defaultPackageArgs
-    , libraryWays = append [vanilla]
-    , rtsWays     = append [vanilla, threaded] }
+    , libraryWays = append [vanilla] }
 
 optimise :: Context -> Bool
 optimise Context {..} =
diff --git a/src/Settings/Flavours/Quickest.hs b/src/Settings/Flavours/Quickest.hs
index 62ad43e..4d64cd0 100644
--- a/src/Settings/Flavours/Quickest.hs
+++ b/src/Settings/Flavours/Quickest.hs
@@ -6,10 +6,10 @@ import {-# SOURCE #-} Settings.Default
 
 quickestFlavour :: Flavour
 quickestFlavour = defaultFlavour
-    { name         = "quickest"
-    , args         = defaultBuilderArgs <> quickestArgs <> defaultPackageArgs
-    , libraryWays  = append [vanilla]
-    , rtsWays      = quickestRtsWays }
+    { name        = "quickest"
+    , args        = defaultBuilderArgs <> quickestArgs <> defaultPackageArgs
+    , libraryWays = append [vanilla]
+    , rtsWays     = quickestRtsWays }
 
 quickestArgs :: Args
 quickestArgs = builder Ghc ? arg "-O0"