From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25925 invoked by alias); 11 Dec 2002 04:27:37 -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 25905 invoked from network); 11 Dec 2002 04:27:34 -0000 Received: from unknown (HELO mailout6-0.nyroc.rr.com) (24.92.226.177) by sources.redhat.com with SMTP; 11 Dec 2002 04:27:34 -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 gBB4RQk17605; Tue, 10 Dec 2002 23:27:26 -0500 (EST) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 18LyS6-00015k-00; Tue, 10 Dec 2002 23:26:30 -0500 Date: Tue, 10 Dec 2002 21:47:00 -0000 To: gcc-patches@gcc.gnu.org, binutils@sources.redhat.com, gdb-patches@sources.redhat.com, dj@redhat.com Subject: (toplevel patch) simplify configure Message-ID: <20021211042630.GA4197@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/msg00354.txt.bz2 The variables CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET were substituted in 'configure' if Canadian, and in configure.in otherwise. They are now substituted in 'configure.in' always. (Their values do not change.) Tested with some combinations of host & target on i686-pc-linux-gnu. This might conceivably make it harder to do Canadian cross builds targeting v810, which sets CC_FOR_TARGET in its target Makefile fragment. :-/ If anyone cares, I'll try to work up some sort of fix. * configure: Remove unneeded 'export's. Make CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET substituted in configure.in only. Index: configure =================================================================== RCS file: /cvs/src/src/configure,v retrieving revision 1.32 diff -u -r1.32 configure --- configure 11 Dec 2002 04:14:47 -0000 1.32 +++ configure 11 Dec 2002 04:19:45 -0000 @@ -869,16 +869,16 @@ 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} WINDRES WINDRES_FOR_TARGET YACC" +tools="${tools} OBJCOPY OBJDUMP" if [ "${build}" != "${host}" ]; then # If we are doing a Canadian Cross, in which the host and build systems # are not the same, we set reasonable default values for the tools. - tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD" - tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET GCJ_FOR_TARGET" - 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} WINDRES WINDRES_FOR_TARGET YACC" - tools="${tools} OBJCOPY OBJDUMP" + tools="${tools} RANLIB" for var in ${tools}; do if eval [ -z \"\$${var}\" ] && [ -r Makefile ]; then @@ -968,17 +968,6 @@ LEX=${LEX-flex} fi - # Export variables which autoconf might try to set. - export AS - export AR - export CC_FOR_BUILD - export DLLTOOL - export LD - export NM - export RANLIB - export WINDRES - export OBJCOPY - export OBJDUMP else # Set reasonable default values for some tools even if not Canadian. # Of course, these are different reasonable default values, originally @@ -988,12 +977,6 @@ # in Makefile.in, so can still be overridden by fragments. # This is all going to change when we autoconfiscate... - 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_FOR_TARGET" - tools="${tools} WINDRES WINDRES_FOR_TARGET YACC" - AR=ar AR_FOR_TARGET='\$(USUAL_AR_FOR_TARGET)' AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target} @@ -1063,11 +1046,6 @@ CFLAGS=${CFLAGS-"-g"} CXXFLAGS=${CXXFLAGS-"-g -O2"} fi - -export CC -export CXX -export CFLAGS -export CXXFLAGS # FIXME Should this be done recursively ??? (Useful for e.g. gdbtest) # Set up the list of links to be made.