From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18806 invoked by alias); 20 Dec 2002 02:08:24 -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 18769 invoked from network); 20 Dec 2002 02:08:22 -0000 Received: from unknown (HELO mailout5-0.nyroc.rr.com) (24.92.226.122) by 209.249.29.67 with SMTP; 20 Dec 2002 02:08:22 -0000 Received: from doctormoo (syr-24-24-16-193.twcny.rr.com [24.24.16.193]) by mailout5-0.nyroc.rr.com (8.11.6/RoadRunner 1.20) with ESMTP id gBK27uF23249; Thu, 19 Dec 2002 21:07:56 -0500 (EST) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 18PCYk-0000SE-00; Thu, 19 Dec 2002 21:06:42 -0500 Date: Thu, 19 Dec 2002 18:09:00 -0000 To: dj@redhat.com, gcc-patches@gcc.gnu.org, binutils@sources.redhat.com, gdb-patches@sources.redhat.com Subject: (toplevel patch) move-if-change multilib.out Message-ID: <20021220020641.GA1747@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/msg00570.txt.bz2 This hopefully does the right thing. At least, it seems to. OK to commit? * Makefile.tpl: Apply move-if-change to multilib.out. * Makefile.in: Regenerate. * configure.in: Delete useless stuff. Index: Makefile.tpl =================================================================== RCS file: /cvs/gcc/gcc/Makefile.tpl,v retrieving revision 1.21 diff -u -r1.21 Makefile.tpl --- Makefile.tpl 19 Dec 2002 20:23:50 -0000 1.21 +++ Makefile.tpl 20 Dec 2002 02:05:16 -0000 @@ -784,7 +784,6 @@ # built are. TAGS: do-TAGS - # -------------------------------------- # Modules which run on the build machine # -------------------------------------- @@ -968,13 +967,12 @@ maybe-configure-target-[+module+]: configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/Makefile -# Don't manually override CC_FOR_TARGET at make time; get it set right -# at configure time. Otherwise multilibs may be wrong. $(TARGET_SUBDIR)/[+module+]/multilib.out: maybe-all-gcc @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\ r=`${PWD}`; export r; \ echo "Configuring multilibs for [+module+]"; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/[+module+]/multilib.out 2> /dev/null + $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \ + $(srcdir)/move-if-change multilib.tmp $(TARGET_SUBDIR)/[+module+]/multilib.out $(TARGET_SUBDIR)/[+module+]/Makefile: config.status $(TARGET_SUBDIR)/[+module+]/multilib.out @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\ Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/configure.in,v retrieving revision 1.196 diff -u -r1.196 configure.in --- configure.in 19 Dec 2002 20:23:50 -0000 1.196 +++ configure.in 20 Dec 2002 02:05:26 -0000 @@ -1698,12 +1698,6 @@ qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` -# BASE_CC_FOR_TARGET is the actual program file of CC_FOR_TARGET, -# for use in dependencies. Replace $$r with a relative -# path if it's present. -set dummy $CC_FOR_TARGET; cc_for_target_first_word=$2 -BASE_CC_FOR_TARGET=`echo "$cc_for_target_first_word" | sed -e 's,[$][$]r,.,'` - sedtemp=sed.$$ cat >$sedtemp <