From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14146 invoked by alias); 26 Jun 2003 17:24:30 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 14108 invoked from network); 26 Jun 2003 17:24:29 -0000 Received: from unknown (HELO ms-smtp-02.nyroc.rr.com) (24.92.226.49) by sources.redhat.com with SMTP; 26 Jun 2003 17:24:29 -0000 Received: from doctormoo (syr-24-24-16-119.twcny.rr.com [24.24.16.119]) by ms-smtp-02.nyroc.rr.com (8.12.5/8.12.2) with ESMTP id h5QHOSiY000214; Thu, 26 Jun 2003 13:24:28 -0400 (EDT) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 19VaTy-0000PP-00; Thu, 26 Jun 2003 13:24:26 -0400 Date: Thu, 26 Jun 2003 17:24:00 -0000 To: gcc-patches@gcc.gnu.org, binutils@sources.redhat.com, gdb-patches@sources.redhat.com Subject: [toplevel patch] Remove future variable name conflict in configure.in Message-ID: <20030626172426.GA1569@doctormoo> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.4i From: Nathanael Nerode X-SW-Source: 2003-06/txt/msg00794.txt.bz2 This is the only variable name conflict with config-lang.in fragments. It turns out that target_libs isn't used after its late assignment from the config-lang.in fragments, which makes the assignment worthless, so I just deleted it. Tested on i686-pc-linux-gnu. This is the precursor to simply sourcing the config-lang.in fragments at the top level rather than running them through ungodly sed expressions. * configure.in: Rename 'target_libs' to 'target_libraries'. Remove useless reference to 'target_libs'. * configure: Regenerate. Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/configure.in,v retrieving revision 1.241 diff -u -r1.241 configure.in --- configure.in 23 Jun 2003 00:42:54 -0000 1.241 +++ configure.in 26 Jun 2003 17:19:29 -0000 @@ -136,7 +136,7 @@ # these libraries are built for the target environment, and are built after # the host libraries and the host tools (which may be a cross compiler) # -target_libs="target-libiberty \ +target_libraries="target-libiberty \ target-libgloss \ target-newlib \ target-libstdc++-v3 \ @@ -144,10 +144,10 @@ ${libgcj} \ target-libobjc" -# these tools are built using the target libs, and are intended to run only -# in the target environment +# these tools are built using the target libraries, and are intended to +# run only in the target environment # -# note: any program that *uses* libraries that are in the "target_libs" +# note: any program that *uses* libraries that are in the "target_libraries" # list belongs in this list. those programs are also very likely # candidates for the "native_only" list which follows # @@ -162,7 +162,7 @@ ## ${target_configdirs} is directories we build using the target tools. # configdirs=`echo ${host_libs} ${host_tools}` -target_configdirs=`echo ${target_libs} ${target_tools}` +target_configdirs=`echo ${target_libraries} ${target_tools}` # Only make build modules if build != host. # This should be done more generally, but at the moment it doesn't matter. @@ -805,7 +805,7 @@ *) add_this_lang=no ;; esac if test x"${add_this_lang}" = xyes; then - eval target_libs='"$target_libs "'\"$this_lang_libs\" + : else eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs $this_lang_dirs\" fi