[commit: ghc] wip/nfs-locking: Try to invoke libtool via bash. (9e731d6)

[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/9e731d6d7d730b14e805886ca34df7f0bfbac745/ghc

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

commit 9e731d6d7d730b14e805886ca34df7f0bfbac745
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 5 23:43:25 2016 +0000

    Try to invoke libtool via bash.
    
    See #103.


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

9e731d6d7d730b14e805886ca34df7f0bfbac745
 src/Rules/IntegerGmp.hs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Rules/IntegerGmp.hs b/src/Rules/IntegerGmp.hs
index 0d5da26..193b43d 100644
--- a/src/Rules/IntegerGmp.hs
+++ b/src/Rules/IntegerGmp.hs
@@ -6,7 +6,6 @@ import GHC
 import Oracles.Config.Setting
 import Rules.Actions
 import Settings.User
-import Settings.TargetDirectory
 
 integerGmpBase :: FilePath
 integerGmpBase = "libraries/integer-gmp/gmp"
@@ -103,19 +102,19 @@ integerGmpRules = do
         args <- configureArguments
         runConfigure integerGmpBuild envs args
 
-        -- check whether we need to build in tree gmp
-        -- this is indicated by line "HaveFrameworkGMP = YES" in `config.mk`
-
+        -- TODO: currently we configure integerGmp package twice -- optimise
         runConfigure (pkgPath integerGmp) [] []
 
+        -- check whether we need to build in tree gmp
+        -- this is indicated by line "HaveFrameworkGMP = YES" in `config.mk`
         configMk <- liftIO . readFile $ integerGmpBase -/- "config.mk"
         if "HaveFrameworkGMP = YES" `isInfixOf` configMk
         then do
-            putBuild "\n| GMP framework detected and will be used"
+            putBuild "| GMP framework detected and will be used"
             copyFile integerGmpLibraryFakeH integerGmpLibraryH
         else do
-            putBuild "\n| No GMP framework detected"
-            runMake integerGmpBuild []
+            putBuild "| No GMP framework detected; in tree GMP will be built"
+            runMake integerGmpBuild ["LIBTOOL=\"bash libtool\""]
 
             copyFile integerGmpLibraryInTreeH integerGmpLibraryH
             -- TODO: why copy library, can we move it instead?