From 3fedb74514f29b08d6554c978e21c87ced4812b1 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Sat, 28 Dec 2002 00:59:52 +0000 Subject: [PATCH] configure: Fix stupid bug where RANLIB was mistakenly included. * configure: Fix stupid bug where RANLIB was mistakenly included. * configure.in: Rename (buildargs, hostargs, targargs) to (build_configargs, host_configargs, target_configargs). * configure.in: Move logic out of sed statement. From-SVN: r60551 --- ChangeLog | 7 +++++++ configure | 4 ++-- configure.in | 42 +++++++++++++++++++++++++----------------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49a6147e461..6c7b9c460ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2002-12-27 Nathanael Nerode + * configure: Fix stupid bug where RANLIB was mistakenly included. + + * configure.in: Rename (buildargs, hostargs, targargs) to + (build_configargs, host_configargs, target_configargs). + + * configure.in: Move logic out of sed statement. + * configure: Remove unneeded 'export's. Make CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET substituted in configure.in only. diff --git a/configure b/configure index 071ac8fef06..fda28cbdda5 100755 --- a/configure +++ b/configure @@ -87,7 +87,7 @@ srctrigger= target_alias=NOTARGET target_makefile_frag= undefs=NOUNDEFS -version="$Revision: 1.51 $" +version="$Revision: 1.52 $" x11=default bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' @@ -872,7 +872,7 @@ done tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD" tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET BUILD_PREFIX" tools="${tools} BUILD_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM" -tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET" +tools="${tools} NM_FOR_TARGET RANLIB_FOR_TARGET" tools="${tools} WINDRES WINDRES_FOR_TARGET YACC" tools="${tools} OBJCOPY OBJDUMP" if [ "${build}" != "${host}" ]; then diff --git a/configure.in b/configure.in index 107b75630e6..b25080ea60f 100644 --- a/configure.in +++ b/configure.in @@ -1497,7 +1497,7 @@ baseargs=`echo "${arguments}" | \ # 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 @@ case "${cache_file}" in 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 @@ targargs=${baseargs} # 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 @@ fi FLAGS_FOR_TARGET= case " $target_configdirs " in *" newlib "*) - case " $targargs " in + case " $target_configargs " in *" --with-newlib "*) case "$target" in *-cygwin*) @@ -1703,6 +1703,14 @@ qRAW_CXX_FOR_TARGET=`echo "$RAW_CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'` qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` +# Wrap CC_FOR_TARGET and friends, for certain types of builds. +CC_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}" +GCJ_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}" +CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}" +RAW_CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}" +CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}" +RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}" + sedtemp=sed.$$ cat >$sedtemp < Makefile.tem rm -f Makefile $sedtemp -- 2.30.2