[commit: ghc] wip/nfs-locking: Move -rtsopts to linker options (e561f80)

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

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

commit e561f8042ad86c40fda1e4181099c84518e359ad
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Mar 16 00:41:56 2017 +0000

    Move -rtsopts to linker options


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

e561f8042ad86c40fda1e4181099c84518e359ad
 src/Settings/Builders/Ghc.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Settings/Builders/Ghc.hs b/src/Settings/Builders/Ghc.hs
index 006d9f8..8020848 100644
--- a/src/Settings/Builders/Ghc.hs
+++ b/src/Settings/Builders/Ghc.hs
@@ -28,7 +28,8 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do
                    return $ concatMap (words . strip) buildInfo
                else return []
     mconcat [ arg "-no-auto-link-packages"
-            , nonHsMainPackage pkg ? arg "-no-hs-main"
+            ,      nonHsMainPackage pkg  ? arg "-no-hs-main"
+            , not (nonHsMainPackage pkg) ? arg "-rtsopts"
             , append [ "-optl-l" ++           lib | lib <- libs ++ gmpLibs ]
             , append [ "-optl-L" ++ unifyPath dir | dir <- libDirs ] ]
 
@@ -74,8 +75,7 @@ commonGhcArgs = do
             , append $ map ("-optP" ++) cppArgs
             , arg "-odir"    , arg path
             , arg "-hidir"   , arg path
-            , arg "-stubdir" , arg path
-            , (not . nonHsMainPackage) <$> getPackage ? arg "-rtsopts" ]
+            , arg "-stubdir" , arg path ]
 
 -- TODO: Do '-ticky' in all debug ways?
 wayGhcArgs :: Args