[commit: ghc] wip/nfs-locking: Another attempt to invoke libtool via bash, see #103. (375d41e)

[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/375d41e7658d6b4f91c15eaf1ac74ce37b720f1b/ghc

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

commit 375d41e7658d6b4f91c15eaf1ac74ce37b720f1b
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 6 00:51:54 2016 +0000

    Another attempt to invoke libtool via bash, see #103.


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

375d41e7658d6b4f91c15eaf1ac74ce37b720f1b
 src/Rules/Actions.hs    | 6 +++---
 src/Rules/IntegerGmp.hs | 2 +-
 src/Rules/Libffi.hs     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Rules/Actions.hs b/src/Rules/Actions.hs
index 6f116b5..9250357 100644
--- a/src/Rules/Actions.hs
+++ b/src/Rules/Actions.hs
@@ -99,15 +99,15 @@ runConfigure dir opts args = do
 runMake :: FilePath -> [String] -> Action ()
 runMake dir args = do
     need [dir -/- "Makefile"]
-    let note = if null args then "" else " (" ++ intercalate "," args ++ ")"
+    let note = if null args then "" else " (" ++ intercalate ", " args ++ ")"
     putBuild $ "| Run make" ++ note ++ " in " ++ dir ++ "..."
-    quietly $ cmd Shell (EchoStdout False) "make" ["-C", dir, "MAKEFLAGS="] args
+    quietly $ cmd Shell (EchoStdout False) "make" ["-C", dir] args
 
 runBuilder :: Builder -> [String] -> Action ()
 runBuilder builder args = do
     needBuilder laxDependencies builder
     path <- builderPath builder
-    let note = if null args then "" else " (" ++ intercalate "," args ++ ")"
+    let note = if null args then "" else " (" ++ intercalate ", " args ++ ")"
     putBuild $ "| Run " ++ show builder ++ note
     quietly $ cmd [path] args
 
diff --git a/src/Rules/IntegerGmp.hs b/src/Rules/IntegerGmp.hs
index 193b43d..142a9c6 100644
--- a/src/Rules/IntegerGmp.hs
+++ b/src/Rules/IntegerGmp.hs
@@ -114,7 +114,7 @@ integerGmpRules = do
             copyFile integerGmpLibraryFakeH integerGmpLibraryH
         else do
             putBuild "| No GMP framework detected; in tree GMP will be built"
-            runMake integerGmpBuild ["LIBTOOL=\"bash libtool\""]
+            runMake integerGmpBuild ["MAKEFLAGS='LIBTOOL=bash\\ libtool'"]
 
             copyFile integerGmpLibraryInTreeH integerGmpLibraryH
             -- TODO: why copy library, can we move it instead?
diff --git a/src/Rules/Libffi.hs b/src/Rules/Libffi.hs
index 041650f..9d77814 100644
--- a/src/Rules/Libffi.hs
+++ b/src/Rules/Libffi.hs
@@ -91,8 +91,8 @@ libffiRules = do
         args <- configureArguments
         runConfigure libffiBuild envs args
 
-        runMake libffiBuild []
-        runMake libffiBuild ["install"]
+        runMake libffiBuild ["MAKEFLAGS="]
+        runMake libffiBuild ["MAKEFLAGS=", "install"]
 
         forM_ ["ffi.h", "ffitarget.h"] $ \file -> do
             let src = libffiBuild -/- "inst/lib" -/- libname -/- "include" -/- file