[commit: ghc] wip/nfs-locking: Simplify fixLibffiMakefile, no need to chop into lines first (07d94c9)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:50:59 UTC 2017


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

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

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

commit 07d94c918a4fa0f7f5ea43496f4a3e6e95662c08
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Jan 12 22:33:42 2016 +0000

    Simplify fixLibffiMakefile, no need to chop into lines first


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

07d94c918a4fa0f7f5ea43496f4a3e6e95662c08
 src/Rules/Libffi.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Rules/Libffi.hs b/src/Rules/Libffi.hs
index 0c38cd2..63bc1e8 100644
--- a/src/Rules/Libffi.hs
+++ b/src/Rules/Libffi.hs
@@ -28,11 +28,11 @@ libffiLibrary :: FilePath
 libffiLibrary = libffiBuild -/- "inst/lib/libffi.a"
 
 fixLibffiMakefile :: String -> String
-fixLibffiMakefile = unlines . map
-    ( replace "-MD" "-MMD"
+fixLibffiMakefile =
+      replace "-MD" "-MMD"
     . replace "@toolexeclibdir@" "$(libdir)"
     . replace "@INSTALL@" "$(subst ../install-sh,C:/msys/home/chEEtah/ghc/install-sh, at INSTALL@)"
-    ) . lines
+
 
 -- TODO: remove code duplication (see Settings/Builders/GhcCabal.hs)
 configureEnvironment :: Action [CmdOption]



More information about the ghc-commits mailing list