From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-21204-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 27298 invoked by alias); 28 Dec 2002 00:35:03 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 27248 invoked from network); 28 Dec 2002 00:35:02 -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:35:02 -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 gBS0Ybk08261;
	Fri, 27 Dec 2002 19:34:37 -0500 (EST)
Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian))
	id 18S4um-0000d6-00; Fri, 27 Dec 2002 19:33:20 -0500
Date: Fri, 27 Dec 2002 16:36:00 -0000
To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com,
   binutils@sources.redhat.com, dj@redhat.com
Subject: (toplevel patch) Clean up sed
Message-ID: <20021228003319.GA2421@doctormoo>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4i
From: Nathanael Nerode <neroden@twcny.rr.com>
X-SW-Source: 2002-12/txt/msg00692.txt.bz2

This moves some logic out of sed statements into earlier shell assignments, to
clear the way for replacing the sed statements with AC_SUBSTs.  Tested on
i686-pc-linux-gnu, generated Makefile unchanged.

	* configure.in: Move logic out of sed statement.

Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.198
diff -u -r1.198 configure.in
--- configure.in	23 Dec 2002 16:54:15 -0000	1.198
+++ configure.in	28 Dec 2002 00:27:31 -0000
@@ -1703,6 +1703,14 @@
 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 <<EOF
 s%@GDB_TK@%${GDB_TK}%
@@ -1720,12 +1728,12 @@
 s:@target_configdirs@:${target_configdirs}:
 s%@target_configargs@%${targargs}%
 s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}%
-s%@CC_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}%
-s%@GCJ_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}%
-s%@CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}%
-s%@RAW_CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}%
-s%@CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}%
-s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}%
+s%@CC_FOR_TARGET@%${CC_FOR_TARGET}%
+s%@GCJ_FOR_TARGET@%${GCJ_FOR_TARGET}%
+s%@CXX_FOR_TARGET@%${CXX_FOR_TARGET}%
+s%@RAW_CXX_FOR_TARGET@%${RAW_CXX_FOR_TARGET}%
+s%@CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%${CXX_FOR_TARGET_FOR_RECURSIVE_MAKE}%
+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}%