From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12537 invoked by alias); 5 Dec 2002 02:27:38 -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 12522 invoked from network); 5 Dec 2002 02:27:36 -0000 Received: from unknown (HELO mailout6-0.nyroc.rr.com) (24.92.226.177) by sources.redhat.com with SMTP; 5 Dec 2002 02:27:36 -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 gB52RWk03747; Wed, 4 Dec 2002 21:27:33 -0500 (EST) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 18Jliu-0006oq-00; Wed, 04 Dec 2002 21:26:44 -0500 Date: Wed, 04 Dec 2002 18:27:00 -0000 To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com, dj@redhat.com, binutils@sources.redhat.com Subject: (toplevel patch) Configure in Makefile, version 3. Message-ID: <20021205022644.GA21849@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/msg00131.txt.bz2 Forget the last one. I came up with a better (temporarily, anyway) solution. *sigh* Index: Makefile.tpl =================================================================== RCS file: /cvs/gcc/gcc/Makefile.tpl,v retrieving revision 1.5.2.21 diff -u -r1.5.2.21 Makefile.tpl --- Makefile.tpl 4 Dec 2002 01:41:48 -0000 1.5.2.21 +++ Makefile.tpl 5 Dec 2002 02:21:12 -0000 @@ -530,14 +530,8 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) -# This is a list of the configure targets for all of the modules which -# are compiled using the target tools. -CONFIGURE_TARGET_MODULES =[+ - FOR target_modules +] \ - configure-target-[+module+][+ - ENDFOR target_modules +] - -configure-target: $(CONFIGURE_TARGET_MODULES) +configure-host: @configure_host_modules@ +configure-target: @configure_target_modules@ # This is a list of the targets for which we can do a clean-{target}. CLEAN_MODULES =[+ @@ -566,6 +560,7 @@ @all_host_modules@ \ @all_target_modules@ +all-host: @all_host_modules@ all-target: @all_target_modules@ # Do a target for all the subdirectories. A ``make do-X'' will do a @@ -910,7 +905,7 @@ .PHONY: all-[+module+] maybe-all-[+module+] maybe-all-[+module+]: -all-[+module+]: +all-[+module+]: configure-[+module+] @r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ @@ -1139,16 +1134,19 @@ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 +# Don't remake gcc if it's already been made by 'bootstrap'; that causes +# nothing but trouble. This wart will be fixed eventually by moving +# the bootstrap behavior to this file. .PHONY: all-gcc maybe-all-gcc maybe-all-gcc: -all-gcc: - @if [ -f ./gcc/Makefile ] ; then \ +all-gcc: configure-gcc + @if [ -f gcc/xgcc ] ; then \ + exit 0 ; \ + else \ r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \ - else \ - true; \ fi # Building GCC uses some tools for rebuilding "source" files @@ -1162,7 +1160,7 @@ # in parallel. # .PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap -bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap +bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap configure-gcc @r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \