[commit: ghc] wip/nfs-locking: GHC ticket 13583 has been resolved, so the workaround is no longer needed (4347b0d)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:18:26 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/4347b0dc3265faec235672b1ba889bb56b38798a/ghc

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

commit 4347b0dc3265faec235672b1ba889bb56b38798a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Apr 27 00:43:14 2017 +0100

    GHC ticket 13583 has been resolved, so the workaround is no longer needed
    
    See #276


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

4347b0dc3265faec235672b1ba889bb56b38798a
 src/Settings/Builders/Configure.hs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/Settings/Builders/Configure.hs b/src/Settings/Builders/Configure.hs
index 3ab3286..b6142d7 100644
--- a/src/Settings/Builders/Configure.hs
+++ b/src/Settings/Builders/Configure.hs
@@ -1,7 +1,5 @@
 module Settings.Builders.Configure (configureBuilderArgs) where
 
-import qualified System.Info as System
-
 import Settings.Builders.Common
 
 configureBuilderArgs :: Args
@@ -20,9 +18,4 @@ configureBuilderArgs = mconcat
                , "--libdir=" ++ top -/- libffiBuildPath -/- "inst/lib"
                , "--enable-static=yes"
                , "--enable-shared=no" -- TODO: add support for yes
-               , "--host=" ++ targetPlatform ]
-
-    -- On OS X, use "nm-classic" instead of "nm" due to a bug in the latter.
-    -- See https://ghc.haskell.org/trac/ghc/ticket/11744
-    , builder (Configure ".") ? System.os == "darwin" ?
-        arg "--with-nm=$(xcrun --find nm-classic)" ]
+               , "--host=" ++ targetPlatform ] ]



More information about the ghc-commits mailing list