Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Nathanael Nerode <neroden@twcny.rr.com>
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
Date: Tue, 10 Dec 2002 18:10:00 -0000	[thread overview]
Message-ID: <20021211002519.GA1815@doctormoo> (raw)

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/\f//" \


             reply	other threads:[~2002-12-11  0:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-12-10 18:10 Nathanael Nerode [this message]
2002-12-10 18:20 ` DJ Delorie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20021211002519.GA1815@doctormoo \
    --to=neroden@twcny.rr.com \
    --cc=binutils@sources.redhat.com \
    --cc=dj@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=gdb-patches@sources.redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox