[commit: ghc] wip/nfs-locking: Move profilingDynamic to full ways. (3c88f16)

[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/3c88f16cf2ff282481a06abcf0ad839abe1c5fab/ghc

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

commit 3c88f16cf2ff282481a06abcf0ad839abe1c5fab
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Feb 16 00:44:44 2016 +0000

    Move profilingDynamic to full ways.


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

3c88f16cf2ff282481a06abcf0ad839abe1c5fab
 src/Settings/Ways.hs |  1 +
 src/Way.hs           | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Settings/Ways.hs b/src/Settings/Ways.hs
index 223bc79..0fee897 100644
--- a/src/Settings/Ways.hs
+++ b/src/Settings/Ways.hs
@@ -13,6 +13,7 @@ getLibraryWays = fromDiffExpr $ defaultLibraryWays <> userLibraryWays
 getRtsWays :: Expr [Way]
 getRtsWays = fromDiffExpr $ defaultRtsWays <> userRtsWays
 
+-- TODO: what about profilingDynamic way? Do we need platformSupportsSharedLibs?
 -- These are default ways for library packages:
 -- * We always build 'vanilla' way.
 -- * We build 'profiling' way when stage > Stage0.
diff --git a/src/Way.hs b/src/Way.hs
index 01b18d2..b297e79 100644
--- a/src/Way.hs
+++ b/src/Way.hs
@@ -88,7 +88,11 @@ profiling = wayFromUnits [Profiling]
 dynamic :: Way
 dynamic = wayFromUnits [Dynamic]
 
--- RTS only ways. See compiler/main/DynFlags.hs.
+-- | Build with profiling and dynamic linking.
+profilingDynamic :: Way
+profilingDynamic = wayFromUnits [Profiling, Dynamic]
+
+-- RTS only ways below. See compiler/main/DynFlags.hs.
 -- | Build RTS with event logging.
 logging :: Way
 logging = wayFromUnits [Logging]
@@ -101,10 +105,10 @@ threaded = wayFromUnits [Threaded]
 debug :: Way
 debug = wayFromUnits [Debug]
 
+-- | Various combinations of RTS only ways.
 threadedDebug, threadedProfiling, threadedLogging, threadedDynamic,
     threadedDebugProfiling, threadedDebugDynamic, threadedProfilingDynamic,
-    threadedLoggingDynamic, debugProfiling, debugDynamic, profilingDynamic,
-    loggingDynamic :: Way
+    threadedLoggingDynamic, debugProfiling, debugDynamic, loggingDynamic :: Way
 threadedDebug            = wayFromUnits [Threaded, Debug]
 threadedProfiling        = wayFromUnits [Threaded, Profiling]
 threadedLogging          = wayFromUnits [Threaded, Logging]
@@ -115,7 +119,6 @@ threadedProfilingDynamic = wayFromUnits [Threaded, Profiling, Dynamic]
 threadedLoggingDynamic   = wayFromUnits [Threaded, Logging, Dynamic]
 debugProfiling           = wayFromUnits [Debug, Profiling]
 debugDynamic             = wayFromUnits [Debug, Dynamic]
-profilingDynamic         = wayFromUnits [Profiling, Dynamic]
 loggingDynamic           = wayFromUnits [Logging, Dynamic]
 
 wayPrefix :: Way -> String