Patchwork [for-1.5] configure: Check that "libtool" is not the MacOSX one

login
register
mail settings
Submitter Peter Maydell
Date May 4, 2013, 8:57 p.m.
Message ID <1367701071-6630-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/241476/
State New
Headers show

Comments

Peter Maydell - May 4, 2013, 8:57 p.m.
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>
---
 configure | 8 ++++++++
 1 file changed, 8 insertions(+)
Anthony Liguori - May 7, 2013, 6:49 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/configure b/configure
index e818e8b..a9ff4ad 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