This is the mail archive of the libstdc++@sourceware.cygnus.com mailing list for the libstdc++ project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]

Patch to use $(CXX) and $(CXXFLAGS) consistently

To: libstdc++ at sourceware dot cygnus dot com
Subject: Patch to use $(CXX) and $(CXXFLAGS) consistently
From: Chip Salzenberg <chip at valinux dot com>
Date: Wed, 24 Nov 1999 23:05:00 -0800

This patch allows libstdc++ always to use $(CXX) even if it isn't
"g++", and more importantly, it always uses @CXXFLAGS@ which is set
by configure but not currently used.

Index: Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/Makefile.in,v
retrieving revision 1.24
diff -u -2 -r1.24 Makefile.in
--- Makefile.in	1999/11/22 20:03:05	1.24
+++ Makefile.in	1999/11/25 07:02:38
@@ -63,4 +63,5 @@
 CC = @CC@
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
Index: mknumeric_limits
===================================================================
RCS file: /cvs/libstdc++/libstdc++/mknumeric_limits,v
retrieving revision 1.16
diff -u -2 -r1.16 mknumeric_limits
--- mknumeric_limits	1999/10/10 02:58:38	1.16
+++ mknumeric_limits	1999/11/25 07:02:38
@@ -9,5 +9,6 @@
 echo "running mknumeric_limits"
 
-CXX=g++
+: ${CXX:=g++}
+
 case `uname` in
     CYGWIN*) 
@@ -155,5 +156,6 @@
 EOF
 
-$CXX -o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \
+$CXX $CXXFLAGS \
+    -o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \
     -I$BUILD_DIR $LDFLAGS
 
Index: libio/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/libio/Makefile.in,v
retrieving revision 1.23
diff -u -2 -r1.23 Makefile.in
--- Makefile.in	1999/11/11 20:19:53	1.23
+++ Makefile.in	1999/11/25 07:02:39
@@ -63,4 +63,5 @@
 CC = @CC@
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
Index: libio/tests/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/libio/tests/Makefile.in,v
retrieving revision 1.1
diff -u -2 -r1.1 Makefile.in
--- Makefile.in	1999/01/22 17:14:19	1.1
+++ Makefile.in	1999/11/25 07:02:39
@@ -19,9 +19,11 @@
 srcdir = .
 
-CFLAGS = -g
-C_FLAGS = $(CFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/..
-CXXFLAGS = -g
-CC = gcc
-CXX = gcc
+CC = @CC@
+STD_CFLAGS = @CFLAGS@
+CXX = @CXX@
+STD_CXXFLAGS = @CXXFLAGS@
+
+CFLAGS = -g $(STD_CFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/..
+CXXFLAGS = -g $(STD_CXXFLAGS)
 
 #### package, host, target, and site dependent Makefile fragments come in here.
Index: libio/testsuite/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/libio/testsuite/Makefile.in,v
retrieving revision 1.1
diff -u -2 -r1.1 Makefile.in
--- Makefile.in	1999/01/22 17:14:20	1.1
+++ Makefile.in	1999/11/25 07:02:39
@@ -19,9 +19,11 @@
 srcdir = libio.tests
 
-CFLAGS = -g
-C_FLAGS = $(CFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/..
-CXXFLAGS = -g
-CC = gcc
-CXX = gcc
+CC = @CC@
+STD_CFLAGS = @CFLAGS@
+CXX = @CXX@
+STD_CXXFLAGS = @CXXFLAGS@
+
+CFLAGS = -g $(STD_CFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/..
+CXXFLAGS = -g $(STD_CXXFLAGS)
 
 EXPECT = `if [ -f $${rootme}/../../../expect/expect ] ; then \
Index: math/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/math/Makefile.in,v
retrieving revision 1.25
diff -u -2 -r1.25 Makefile.in
--- Makefile.in	1999/11/11 20:19:53	1.25
+++ Makefile.in	1999/11/25 07:02:39
@@ -63,4 +63,5 @@
 CC = @CC@
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
Index: src/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/src/Makefile.in,v
retrieving revision 1.67
diff -u -2 -r1.67 Makefile.in
--- Makefile.in	1999/11/11 20:19:53	1.67
+++ Makefile.in	1999/11/25 07:02:39
@@ -62,4 +62,5 @@
 CC = @CC@
 CXX = @CXX@
+STD_CXXFLAGS = @CXXFLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
@@ -87,8 +88,7 @@
 WERROR = -Werror
 # OTHER_CXXFLAGS = -fsquangle -fhonor-std -fnew-exceptions
-CXXFLAGS = -g -D_GNU_SOURCE -fno-implicit-templates \
+CXXFLAGS = $(STD_CXXFLAGS) -g -D_GNU_SOURCE -fno-implicit-templates \
 	   -Wall -W -Wwrite-strings -Winline $(WERROR) $(OTHER_CXXFLAGS)
 
-
 CXXLINK = $(LIBTOOL) --mode=link $(CC) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 
@@ -512,5 +512,6 @@
 
 $(generated_headers): $(top_srcdir)/mknumeric_limits
-	$(SHELL) $(top_srcdir)/mknumeric_limits `pwd`/.. $(top_srcdir)
+	CXX='$(CXX)'; export CXX; \
+	  $(SHELL) $(top_srcdir)/mknumeric_limits `pwd`/.. $(top_srcdir)
 	@echo timestamp > $(top_builddir)/stamp-limits
 
Index: string/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/string/Makefile.in,v
retrieving revision 1.21
diff -u -2 -r1.21 Makefile.in
--- Makefile.in	1999/11/11 20:19:53	1.21
+++ Makefile.in	1999/11/25 07:02:40
@@ -63,4 +63,5 @@
 CC = @CC@
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@

-- 
Chip Salzenberg             - a.k.a. -              <chip@valinux.com>
     "Fleagal.  Bingo.  Drooper.  Snork.  They're cops."   //MST3K

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]