aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-10-31 18:16:20 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-10-31 18:16:20 +0000
commitdc0f5cb09025bf8c5cc3900bfa4738a83457028f (patch)
tree44c6b5016e472c2d61b503ffbaf35c2cf3f0a649 /src
parentfae180f4777a09d302c54c874f11349fd0323bfb (diff)
downloadpostgresql-dc0f5cb09025bf8c5cc3900bfa4738a83457028f.tar.gz
postgresql-dc0f5cb09025bf8c5cc3900bfa4738a83457028f.zip
Determine CXXFLAGS after the C++ compiler was detected. Also honor
--enable-debug and environment variable override.
Diffstat (limited to 'src')
-rw-r--r--src/makefiles/Makefile.qnx43
-rw-r--r--src/template/aix1
-rw-r--r--src/template/osf1
-rw-r--r--src/template/qnx41
4 files changed, 3 insertions, 3 deletions
diff --git a/src/makefiles/Makefile.qnx4 b/src/makefiles/Makefile.qnx4
index 130a99fd6dd..2cf15be5f5f 100644
--- a/src/makefiles/Makefile.qnx4
+++ b/src/makefiles/Makefile.qnx4
@@ -14,3 +14,6 @@ CFLAGS_SL =
%$(DLSUFFIX): %.o
@echo 'cannot make shared object $@ from $<'
+
+# Hack alert! Fix your compiler installation...
+override CXXFLAGS +=-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
diff --git a/src/template/aix b/src/template/aix
index 75cd678a283..7d6d580a26c 100644
--- a/src/template/aix
+++ b/src/template/aix
@@ -1,6 +1,5 @@
if test "$GCC" = yes ; then
CFLAGS=-pipe
- CXXFLAGS=-pipe
else # not GCC
case $host_os in
aix3.2.5)
diff --git a/src/template/osf b/src/template/osf
index f41a0557d60..938120f73a1 100644
--- a/src/template/osf
+++ b/src/template/osf
@@ -5,5 +5,4 @@ else
CC="$CC -std"
CFLAGS='-O4 -Olimit 2000'
CCC=cxx
- CXXFLAGS='-O4 -Olimit 2000'
fi
diff --git a/src/template/qnx4 b/src/template/qnx4
index cea09e25eea..62ba3ff130d 100644
--- a/src/template/qnx4
+++ b/src/template/qnx4
@@ -1,3 +1,2 @@
CFLAGS=
LIBS=-lunix
-CXXFLAGS=-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++