From patchwork Wed Jan 5 16:33:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 77612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 4971CB6F14 for ; Thu, 6 Jan 2011 03:34:06 +1100 (EST) Received: (qmail 5533 invoked by alias); 5 Jan 2011 16:34:03 -0000 Received: (qmail 5434 invoked by uid 22791); 5 Jan 2011 16:34:02 -0000 X-SWARE-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL, BAYES_05, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 05 Jan 2011 16:33:55 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 15080F5F; Wed, 5 Jan 2011 17:33:53 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 4t+jYBHlP4zr; Wed, 5 Jan 2011 17:33:51 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 6C519F5E; Wed, 5 Jan 2011 17:33:51 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p05GXopX017093; Wed, 5 Jan 2011 17:33:50 +0100 (MET) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Paolo Bonzini Subject: [build] Don't assume ldd understands --version (PR other/45915) Date: Wed, 05 Jan 2011 17:33:50 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The following trivial patch fixes PR other/45915. I suppose ldd --version only works on glibc-based systems; otherwise one might have to deal with different output formats. Anyway, the patch makes the error (from expr in my case) during configure go away during i386-pc-solaris2.11 testing. Ok for mainline? Rainer 2011-01-03 Rainer Orth PR other/45915 * configure.ac (gcc_cv_as_gnu_unique_object): Only use ldd --version output if supported. * configure: Regenerate. diff -r 21c87ea1460e gcc/configure.ac --- a/gcc/configure.ac Sun Jan 02 01:05:21 2011 +0100 +++ b/gcc/configure.ac Mon Jan 03 10:46:02 2011 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to generate a configuration script. # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. #This file is part of GCC. @@ -3941,6 +3941,7 @@ [.type foo, @gnu_unique_object],, # Also check for ld.so support, i.e. glibc 2.11 or higher. [[if test x$host = x$build -a x$host = x$target && + ldd --version 2>/dev/null && glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then glibcmajor=`expr "$glibcver" : "\([0-9]*\)"` glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"`