[commit: ghc] wip/nfs-locking: Simplify (2ac9e71)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:00:42 UTC 2017


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

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

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

commit 2ac9e71747347801d70e80e9d603a5c79c8f5d5a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun May 15 00:20:54 2016 +0100

    Simplify


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

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

diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index 60fdf7a..35a1f95 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -96,13 +96,13 @@ rtsPackageArgs = package rts ? do
 
         , builder (GhcPkg Stage1) ? mconcat
           [ remove ["rts/stage1/inplace-pkg-config"] -- TODO: fix, see #113
-          , arg $ rtsConf ]
+          , arg rtsConf ]
 
-        , builder HsCpp ? mconcat
-          [ arg ("-DTOP=" ++ quote top)
-          , arg ("-DFFI_INCLUDE_DIR=" ++ quote ffiIncludeDir)
-          , arg ("-DFFI_LIB_DIR=" ++ quote ffiLibraryDir)
-          , arg $ "-DFFI_LIB=" ++ quote libffiName ] ]
+        , builder HsCpp ? append
+          [ "-DTOP="             ++ quote top
+          , "-DFFI_INCLUDE_DIR=" ++ quote ffiIncludeDir
+          , "-DFFI_LIB_DIR="     ++ quote ffiLibraryDir
+          , "-DFFI_LIB="         ++ quote libffiName ] ]
 
 
 -- # If we're compiling on windows, enforce that we only support XP+



More information about the ghc-commits mailing list