[commit: ghc] wip/nfs-locking: Fix CI regression, minor revision. (8f68b8b)

[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/8f68b8bc8dc40a17eb8c0816437a4b474b9def78/ghc

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

commit 8f68b8bc8dc40a17eb8c0816437a4b474b9def78
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 19 09:34:35 2016 +0000

    Fix CI regression, minor revision.
    
    See #183.


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

8f68b8bc8dc40a17eb8c0816437a4b474b9def78
 cfg/system.config.in            | 2 +-
 src/Rules/Gmp.hs                | 4 ++--
 src/Rules/Libffi.hs             | 8 ++++----
 src/Settings/Builders/Hsc2Hs.hs | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cfg/system.config.in b/cfg/system.config.in
index 0eb775a..43730a2 100644
--- a/cfg/system.config.in
+++ b/cfg/system.config.in
@@ -106,7 +106,7 @@ iconv-lib-dir     = @ICONV_LIB_DIRS@
 gmp-include-dir   = @GMP_INCLUDE_DIRS@
 gmp-lib-dir       = @GMP_LIB_DIRS@
 
-use-system-ffi     = @UseSystemLibFFI@
+use-system-ffi    = @UseSystemLibFFI@
 ffi-include-dir   = @FFIIncludeDir@
 ffi-lib-dir       = @FFILibDir@
 
diff --git a/src/Rules/Gmp.hs b/src/Rules/Gmp.hs
index 702e645..b6bfdf0 100644
--- a/src/Rules/Gmp.hs
+++ b/src/Rules/Gmp.hs
@@ -64,8 +64,8 @@ configureIntGmpArguments :: Action [String]
 configureIntGmpArguments = do
     includes      <- setting GmpIncludeDir
     libs          <- setting GmpLibDir
-    return $ map ("--with-gmp-includes=" ++) [includes]
-          ++ map ("--with-gmp-libraries=" ++) [libs]
+    return $ map ("--with-gmp-includes="  ++) (words includes)
+          ++ map ("--with-gmp-libraries=" ++) (words libs)
 
 -- TODO: we rebuild gmp every time.
 gmpRules :: Rules ()
diff --git a/src/Rules/Libffi.hs b/src/Rules/Libffi.hs
index 97ebc2d..0f4e05a 100644
--- a/src/Rules/Libffi.hs
+++ b/src/Rules/Libffi.hs
@@ -71,13 +71,13 @@ libffiRules :: Rules ()
 libffiRules = do
     libffiDependencies &%> \_ -> do
         when trackBuildSystem $ need [sourcePath -/- "Rules/Libffi.hs"]
-        ffi_header_dir <- setting FfiIncludeDir
-        use_system_ffi <- flag UseSystemFfi
-        if use_system_ffi
+        ffiHeaderDir <- setting FfiIncludeDir
+        useSystemFfi <- flag UseSystemFfi
+        if useSystemFfi
         then do
           putBuild "| System supplied FFI library will be used"
           forM_ ["ffi.h", "ffitarget.h"] $ \file -> do
-              let src = ffi_header_dir  -/- file
+              let src = ffiHeaderDir  -/- file
               copyFile src (rtsBuildPath -/- file)
           putSuccess $ "| Successfully copied system supplied FFI library header files"
         else do
diff --git a/src/Settings/Builders/Hsc2Hs.hs b/src/Settings/Builders/Hsc2Hs.hs
index 4529af8..ffa3b1a 100644
--- a/src/Settings/Builders/Hsc2Hs.hs
+++ b/src/Settings/Builders/Hsc2Hs.hs
@@ -32,7 +32,7 @@ hsc2hsBuilderArgs = builder Hsc2Hs ? do
     mconcat [ arg $ "--cc=" ++ ccPath
             , arg $ "--ld=" ++ ccPath
             , notM windowsHost ? arg "--cross-safe"
-            , append $ map ("-I"       ++) [gmpDir]
+            , append . map ("-I"       ++) $ words gmpDir
             , append $ map ("--cflag=" ++) cFlags
             , append $ map ("--lflag=" ++) lFlags
             , notStage0 ? crossCompiling ? arg "--cross-compile"