From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9273 invoked by alias); 11 Dec 2002 00:26:20 -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 9258 invoked from network); 11 Dec 2002 00:26:18 -0000 Received: from unknown (HELO mailout5-0.nyroc.rr.com) (24.92.226.122) by sources.redhat.com with SMTP; 11 Dec 2002 00:26:18 -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 gBB0QFF04089; Tue, 10 Dec 2002 19:26:15 -0500 (EST) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 18Lugi-0000TK-00; Tue, 10 Dec 2002 19:25:20 -0500 Date: Tue, 10 Dec 2002 18:10:00 -0000 To: gcc-patches@gcc.gnu.org, binutils@sources.redhat.com, gdb-patches@sources.redhat.com, dj@redhat.com Subject: (toplevel patch) more autoconf-style substitutions Message-ID: <20021211002519.GA1815@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/msg00347.txt.bz2 Subsitute a few more things in an autoconf-friendly manner. This now works because these variables are now only set once. * Makefile.tpl: Substitute more autoconfily. * configure: Substitute more autoconfily. * Makefile.in: Regenerate. Index: Makefile.tpl =================================================================== RCS file: /cvs/gcc/gcc/Makefile.tpl,v retrieving revision 1.5.2.24 diff -u -r1.5.2.24 Makefile.tpl --- Makefile.tpl 8 Dec 2002 22:39:49 -0000 1.5.2.24 +++ Makefile.tpl 11 Dec 2002 00:24:02 -0000 @@ -112,7 +112,7 @@ AS = @AS@ AR = @AR@ AR_FLAGS = rc -CC = cc +CC = @CC@ # Special variables passed down in EXTRA_GCC_FLAGS. They are defined # here so that they can be overridden by Makefile fragments. @@ -120,9 +120,8 @@ BUILD_PREFIX = @BUILD_PREFIX@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ -# These flag values are normally overridden by the configure script. -CFLAGS = -g -CXXFLAGS = -g -O2 +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ LDFLAGS = LIBCFLAGS = $(CFLAGS) @@ -137,7 +136,7 @@ PICFLAG = PICFLAG_FOR_TARGET = -CXX = c++ +CXX = @CXX@ # Use -O2 to stress test the compiler. LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates Index: configure =================================================================== RCS file: /cvs/gcc/gcc/configure,v retrieving revision 1.46.6.9 diff -u -r1.46.6.9 configure --- configure 5 Dec 2002 18:33:14 -0000 1.46.6.9 +++ configure 11 Dec 2002 00:24:13 -0000 @@ -1279,34 +1279,10 @@ -e "s|@oldincludedir@|${oldincludedir}|" \ -e "s|@infodir@|${infodir}|" \ -e "s|@mandir@|${mandir}|" \ - -e "/^CC[ ]*=/{ - :loop1 - /\\\\$/ N - s/\\\\\\n//g - t loop1 - s%^CC[ ]*=.*$%CC = ${CC}% - }" \ - -e "/^CXX[ ]*=/{ - :loop2 - /\\\\$/ N - s/\\\\\\n//g - t loop2 - s%^CXX[ ]*=.*$%CXX = ${CXX}% - }" \ - -e "/^CFLAGS[ ]*=/{ - :loop3 - /\\\\$/ N - s/\\\\\\n//g - t loop3 - s%^CFLAGS[ ]*=.*$%CFLAGS = ${CFLAGS}% - }" \ - -e "/^CXXFLAGS[ ]*=/{ - :loop4 - /\\\\$/ N - s/\\\\\\n//g - t loop4 - s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% - }" \ + -e "s|@CC@|${CC}|" \ + -e "s|@CXX@|${CXX}|" \ + -e "s|@CC@|${CFLAGS}|" \ + -e "s|@CXXFLAGS@|${CXXFLAGS}|" \ -e "s|@config_shell@|${config_shell}|" \ -e "s|@srcdir@|${srcdir}|" \ -e "s/ //" \