Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit fb75e39

Browse files
committed
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.
1 parent 73d8bbc commit fb75e39

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/interfaces/libpq++/Makefile.in

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.22 2000/03/16 15:34:36 momjian Exp $
9+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.23 2000/03/31 05:00:36 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -18,18 +18,11 @@ SRCDIR= @top_srcdir@
1818
include $(SRCDIR)/Makefile.global
1919

2020
CXX=@CXX@
21+
CXXFLAGS=@CXXFLAGS@
2122

2223
SRCHEADERDIR = $(SRCDIR)/include
2324
LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
2425

25-
# We have to override -Werror, which makes warnings fatal, because we
26-
# inevitably get the warning, "abstract declarator used as declaration"
27-
# because of our inclusion of c.h and we don't know how to stop that.
28-
29-
ifeq ($(CXX), g++)
30-
CXXFLAGS+= -Wno-error
31-
endif
32-
3326
CXXFLAGS+= -I$(SRCDIR)/backend \
3427
-I$(SRCHEADERDIR) \
3528
-I$(LIBPQDIR)
@@ -62,7 +55,7 @@ include $(SRCDIR)/Makefile.shlib
6255

6356

6457
# Pull shared-lib CFLAGS into CXXFLAGS
65-
CXXFLAGS+= $(CFLAGS)
58+
CXXFLAGS+= $(CFLAGS_SL)
6659

6760

6861
.PHONY: examples

0 commit comments

Comments
 (0)