From patchwork Sat May 4 20:57:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 16711 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2E65123904 for ; Sat, 4 May 2013 20:58:11 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ht11sf4773670vcb.9 for ; Sat, 04 May 2013 13:57:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=CGoi5z2Y5MvxEb6AoSo+6PZQq4HgcTAauL2YNPDJRrc=; b=ZW3MnaqYhzz64A1+98X8hX2L0gT+vS4+jTrgbDos/I2+TctNFlz/R5YrYFk/FVytsS kKTZzf5zDY2MHFUpDRg9XxED3xqyQ5PnlP9RVDvHPCm/9/hRGcCL2xB2e+JLVLCazTgH o1lapGu7vbTbLyawZFKJa7mnM2kd/HLU1cltLAiK3rZkCqUH0uIQAKHKsLN4t0OaIWyD 9lENCJa8WJPgYhSfHkstY5v67paBUe/KVIbBDe+wtAi/YgTZSyP6izWTxqrZ++KQCT7d ZtRy3XVJVAp+1DIDupxqZNsRU4yp1+wvZNE+jHk00LYf6k3M5MBNRb55lTz4YGLOIsqC yJLQ== X-Received: by 10.236.123.199 with SMTP id v47mr10447916yhh.21.1367701078157; Sat, 04 May 2013 13:57:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.86.232 with SMTP id s8ls1723788qez.94.gmail; Sat, 04 May 2013 13:57:57 -0700 (PDT) X-Received: by 10.52.156.99 with SMTP id wd3mr1869539vdb.98.1367701077891; Sat, 04 May 2013 13:57:57 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id sc6si7561399vdc.86.2013.05.04.13.57.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 04 May 2013 13:57:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id kw10so2260351vcb.37 for ; Sat, 04 May 2013 13:57:57 -0700 (PDT) X-Received: by 10.52.71.4 with SMTP id q4mr4407011vdu.8.1367701077766; Sat, 04 May 2013 13:57:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp74179veb; Sat, 4 May 2013 13:57:57 -0700 (PDT) X-Received: by 10.180.184.11 with SMTP id eq11mr2940136wic.30.1367701076550; Sat, 04 May 2013 13:57:56 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id f10si909996wiz.26.2013.05.04.13.57.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 04 May 2013 13:57:56 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UYjWh-0001jN-4M; Sat, 04 May 2013 21:57:51 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Cheung Subject: [PATCH for-1.5] configure: Check that "libtool" is not the MacOSX one Date: Sat, 4 May 2013 21:57:51 +0100 Message-Id: <1367701071-6630-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQnP8iAmMd0GiK5BX80FDn20e2rYiGd5HEDY065KXkU/Eg64rOQs3vGuXDOc2GfM8eoMUZjL X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Signed-off-by: Peter Maydell --- configure | 8 ++++++++ 1 file changed, 8 insertions(+) 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