From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26864 invoked by alias); 28 Dec 2002 00:34:49 -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 26827 invoked from network); 28 Dec 2002 00:34:46 -0000 Received: from unknown (HELO mailout6-0.nyroc.rr.com) (24.92.226.125) by 209.249.29.67 with SMTP; 28 Dec 2002 00:34:46 -0000 Received: from doctormoo (syr-24-24-16-193.twcny.rr.com [24.24.16.193]) by mailout6-0.nyroc.rr.com (8.11.6/RoadRunner 1.20) with ESMTP id gBS0YLk08030; Fri, 27 Dec 2002 19:34:21 -0500 (EST) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 18S4uV-0000cy-00; Fri, 27 Dec 2002 19:33:03 -0500 Date: Fri, 27 Dec 2002 16:35:00 -0000 To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com, binutils@sources.redhat.com, dj@redhat.com Subject: (toplevel patch) rename buildargs,hostargs,targargs Message-ID: <20021228003302.GA2413@doctormoo> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i From: Nathanael Nerode X-SW-Source: 2002-12/txt/msg00691.txt.bz2 This renames some shell variables (buildargs, hostargs, targargs) to the same names used for the substitutions into the Makefile, to clear the way for replacing the sed statements with AC_SUBSTs. Tested on i686-pc-linux-gnu, generated Makefile unchanged. * configure.in: Rename (buildargs, hostargs, targargs) to (build_configargs, host_configargs, target_configargs). --- configure.in.1 2002-12-27 19:27:53.000000000 -0500 +++ configure.in 2002-12-27 19:29:33.000000000 -0500 @@ -1497,7 +1497,7 @@ # For the build-side libraries, we just need to pretend we're native, # and not use the same cache file. Multilibs are neither needed nor # desired. -buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${baseargs}" +build_configargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${baseargs}" # For host modules, accept cache file option, or specification as blank. case "${cache_file}" in @@ -1509,9 +1509,9 @@ cache_file_option="--cache-file=../${cache_file}" ;; esac -hostargs="${cache_file_option} ${buildopt} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}" +host_configargs="${cache_file_option} ${buildopt} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}" -targargs=${baseargs} +target_configargs=${baseargs} # Passing a --with-cross-host argument lets the target libraries know # whether they are being built with a cross-compiler or being built @@ -1519,22 +1519,22 @@ # sorts of decisions they want to make on this basis. Please consider # this option to be deprecated. FIXME. if test x${is_cross_compiler} = xyes ; then - targargs="--with-cross-host=${host_alias} ${targargs}" + target_configargs="--with-cross-host=${host_alias} ${target_configargs}" fi # Default to --enable-multilib. if test x${enable_multilib} = x ; then - targargs="--enable-multilib ${targargs}" + target_configargs="--enable-multilib ${target_configargs}" fi # Pass --with-newlib if appropriate. Note that target_configdirs has # changed from the earlier setting of with_newlib. if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && test -d ${srcdir}/newlib ; then - targargs="--with-newlib ${targargs}" + target_configargs="--with-newlib ${target_configargs}" fi # Pass the appropriate --host, --build, and --cache-file arguments. -targargs="--cache-file=../config.cache --host=${target_alias} --build=${build_alias} ${targargs}" +target_configargs="--cache-file=../config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" # provide a proper gxx_include_dir. # Note, if you change the default, make sure to fix both here and in @@ -1568,7 +1568,7 @@ FLAGS_FOR_TARGET= case " $target_configdirs " in *" newlib "*) - case " $targargs " in + case " $target_configargs " in *" --with-newlib "*) case "$target" in *-cygwin*) @@ -1726,7 +1726,7 @@ s%@check_target_modules@%${check_target_modules}% s%@install_target_modules@%${install_target_modules}% s:@target_configdirs@:${target_configdirs}: -s%@target_configargs@%${targargs}% +s%@target_configargs@%${target_configargs}% s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}% s%@CC_FOR_TARGET@%${CC_FOR_TARGET}% s%@GCJ_FOR_TARGET@%${GCJ_FOR_TARGET}% @@ -1736,10 +1736,10 @@ s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%${RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE}% s%@target_subdir@%${target_subdir}% s%@build_subdir@%${build_subdir}% -s%@build_configargs@%${buildargs}% +s%@build_configargs@%${build_configargs}% s%@gxx_include_dir@%${gxx_include_dir}% s%@libstdcxx_incdir@%${libstdcxx_incdir}% -s%@host_configargs@%${hostargs}% +s%@host_configargs@%${host_configargs}% EOF sed -f $sedtemp Makefile > Makefile.tem rm -f Makefile $sedtemp