From fb75e3980070206d83645684e4ab81467f48bb2a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 31 Mar 2000 05:00:36 +0000
Subject: [PATCH] Use the CXXFLAGS exported by configure (amazingly, we weren't
before!) and do not arbitrarily pull in CFLAGS instead. This caters to
platforms where the C++ compiler does not like all the same switches the C
compiler wants.
---
src/interfaces/libpq++/Makefile.in | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in
index 8b579104d4e..29a7322929d 100644
--- a/src/interfaces/libpq++/Makefile.in
+++ b/src/interfaces/libpq++/Makefile.in
@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.22 2000/03/16 15:34:36 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.23 2000/03/31 05:00:36 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -18,18 +18,11 @@ SRCDIR= @top_srcdir@
include $(SRCDIR)/Makefile.global
CXX=@CXX@
+CXXFLAGS=@CXXFLAGS@
SRCHEADERDIR = $(SRCDIR)/include
LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
-# We have to override -Werror, which makes warnings fatal, because we
-# inevitably get the warning, "abstract declarator used as declaration"
-# because of our inclusion of c.h and we don't know how to stop that.
-
-ifeq ($(CXX), g++)
-CXXFLAGS+= -Wno-error
-endif
-
CXXFLAGS+= -I$(SRCDIR)/backend \
-I$(SRCHEADERDIR) \
-I$(LIBPQDIR)
@@ -62,7 +55,7 @@ include $(SRCDIR)/Makefile.shlib
# Pull shared-lib CFLAGS into CXXFLAGS
-CXXFLAGS+= $(CFLAGS)
+CXXFLAGS+= $(CFLAGS_SL)
.PHONY: examples
--
GitLab