aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-05-04 21:57:51 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-06 06:52:03 -0500
commit8e515b125d5f7849167dbee6cbe6ef61636607d4 (patch)
treebd855ab953f50998254f3e53c9fd452df1c516b0
parente4b006b7a5bce59d4f692d5da04eede5f6d0f31c (diff)
downloadqemu-arm-8e515b125d5f7849167dbee6cbe6ef61636607d4.tar.gz
configure: Check that "libtool" is not the MacOSX one
The "libtool" binary on MacOSX is not GNU libtool, and doesn't support anything like the same set of command line options. Test whether we have accidentally picked this up (by looking for whether it handles the GNU --version switch), and discard it if so. The fallback machinery for the "we don't have a libtool" case will work fine. This fixes a failure in "make install" on MacOSX. Reported-by: Peter Cheung <mcheung63@hotmail.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1367701071-6630-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-xconfigure8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure b/configure
index e818e8b357..a9ff4ad882 100755
--- a/configure
+++ b/configure
@@ -1685,6 +1685,14 @@ if ! has $libtool; then
libtool=
fi
+# MacOSX ships with a libtool which isn't the GNU one; weed this
+# out by checking whether libtool supports the --version switch
+if test -n "$libtool"; then
+ if ! "$libtool" --version >/dev/null 2>&1; then
+ libtool=
+ fi
+fi
+
##########################################
# Sparse probe
if test "$sparse" != "no" ; then