Commit cd8f4b99 authored by Moritz Angermann's avatar Moritz Angermann Committed by Ben Gamari

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
parent 1c83fd81
...@@ -491,8 +491,13 @@ AC_DEFUN([FP_SETTINGS], ...@@ -491,8 +491,13 @@ AC_DEFUN([FP_SETTINGS],
else else
SettingsWindresCommand="$Windres" SettingsWindresCommand="$Windres"
fi fi
SettingsLibtoolCommand="libtool" SettingsTouchCommand='touch'
SettingsTouchCommand='touch' fi
if test -z "$LibtoolCmd"
then
SettingsLibtoolCommand="libtool"
else
SettingsLibtoolCommand="$LibtoolCmd"
fi fi
if test -z "$LlcCmd" if test -z "$LlcCmd"
then then
......
...@@ -569,6 +569,11 @@ fi ...@@ -569,6 +569,11 @@ fi
RanlibCmd="$RANLIB" RanlibCmd="$RANLIB"
RANLIB="$RanlibCmd" 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 # 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 # tools we are looking for. In the past, GHC supported a number of
...@@ -1250,6 +1255,7 @@ echo "\ ...@@ -1250,6 +1255,7 @@ echo "\
ar : $ArCmd ar : $ArCmd
ld : $LdCmd ld : $LdCmd
nm : $NmCmd nm : $NmCmd
libtool : $LibtoolCmd
objdump : $ObjdumpCmd objdump : $ObjdumpCmd
ranlib : $RanlibCmd ranlib : $RanlibCmd
windres : $Windres windres : $Windres
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment