[commit: ghc] master: Check target libtool (cd8f4b9)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cd8f4b9917c6fd9aa894ecafc505224e41b947fa/ghc

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

commit cd8f4b9917c6fd9aa894ecafc505224e41b947fa
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Thu Jun 8 14:59:20 2017 -0400

    Check target libtool
    
    This will qualify the libtool with the target, e.g.
    arch-vendor-os-libtool, instead of simply using libtool.
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: Ericson2314, ryantrinkle, rwbarton, thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D3617


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

cd8f4b9917c6fd9aa894ecafc505224e41b947fa
 aclocal.m4   | 9 +++++++--
 configure.ac | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index adc70bc..d566f83 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -491,8 +491,13 @@ AC_DEFUN([FP_SETTINGS],
         else
             SettingsWindresCommand="$Windres"
         fi
-        SettingsLibtoolCommand="libtool"
-        SettingsTouchCommand='touch'
+       SettingsTouchCommand='touch'
+    fi
+    if test -z "$LibtoolCmd"
+    then
+      SettingsLibtoolCommand="libtool"
+    else
+      SettingsLibtoolCommand="$LibtoolCmd"
     fi
     if test -z "$LlcCmd"
     then
diff --git a/configure.ac b/configure.ac
index 45b2ab3..a32e6b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,6 +569,11 @@ fi
 RanlibCmd="$RANLIB"
 RANLIB="$RanlibCmd"
 
+dnl ** which libtool to use?
+dnl --------------------------------------------------------------
+AC_CHECK_TARGET_TOOL([LIBTOOL], [libtool])
+LibtoolCmd="$LIBTOOL"
+LIBTOOL="$LibtoolCmd"
 
 # Here is where we re-target which specific version of the LLVM
 # tools we are looking for. In the past, GHC supported a number of
@@ -1250,6 +1255,7 @@ echo "\
    ar           : $ArCmd
    ld           : $LdCmd
    nm           : $NmCmd
+   libtool      : $LibtoolCmd
    objdump      : $ObjdumpCmd
    ranlib       : $RanlibCmd
    windres      : $Windres