[commit: ghc] wip/nfs-locking: Drop outdated RTS arguments, fix Windows build (0e193c0)

[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/0e193c084f1ee8d9f044e612b319cf9963a5053d/ghc

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

commit 0e193c084f1ee8d9f044e612b319cf9963a5053d
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Sep 26 20:17:50 2017 +0200

    Drop outdated RTS arguments, fix Windows build


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

0e193c084f1ee8d9f044e612b319cf9963a5053d
 src/Settings/Packages/Rts.hs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index c9d6359..c71b729 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -54,13 +54,6 @@ rtsLibffiLibrary way = do
     rtsPath <- rtsBuildPath
     return $ rtsPath -/- "lib" ++ name ++ suf
 
--- ref: mk/config.mk.in
-ghcRtsWithLibDw :: Action Bool
-ghcRtsWithLibDw = do
-    goodArch <- anyTargetArch ["i386", "x86_64"]
-    withLibDw <- flag HaveLibMingwEx
-    return $ goodArch && withLibDw
-
 -- Compile various performance-critical pieces *without* -fPIC -dynamic
 -- even when building a shared library.  If we don't do this, then the
 -- GC runs about 50% slower on x86 due to the overheads of PIC.  The
@@ -190,8 +183,7 @@ rtsPackageArgs = package rts ? do
             , input "//StgCRun.c" ? windowsHost ? arg "-Wno-return-local-addr"
             , input "//RetainerProfile.c" ? flag GccIsClang ?
               pure [ "-Wno-incompatible-pointer-types" ]
-            , targetOs == "mingw32" ? arg ("-DWINVER=" ++ rtsWindowsVersion)
-            , ghcRtsWithLibDw ? arg "-DUSE_LIBDW" ]
+            , windowsHost ? arg ("-DWINVER=" ++ rtsWindowsVersion) ]
 
     mconcat
         [ rtsLibffiArgs
@@ -210,6 +202,4 @@ rtsPackageArgs = package rts ? do
           pure [ "-DINSTALLING"
                , "-DLIB_DIR=\"" ++ destDir ++ ghclibDir ++ "\""
                , "-DINCLUDE_DIR=\"" ++ destDir ++ ghclibDir -/- "include\"" ]
-        , builder HsCpp ? mconcat
-            [ ghcRtsWithLibDw ? arg "-DUSE_LIBDW"
-            , flag HaveLibMingwEx ? arg "-DHAVE_LIBMINGWEX" ] ]
+        , builder HsCpp ? flag HaveLibMingwEx ? arg "-DHAVE_LIBMINGWEX" ]