aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-10-09 14:40:37 +0000
committerBruce Momjian <bruce@momjian.us>2003-10-09 14:40:37 +0000
commit7185455c088bcb407a0b997f95863b4c29f203ac (patch)
tree80b237c03022e1d37159ce6c323dadc9be473af4 /src
parent1dad866bb47c1ab733015abba2f5d8a852279774 (diff)
downloadpostgresql-7185455c088bcb407a0b997f95863b4c29f203ac.tar.gz
postgresql-7185455c088bcb407a0b997f95863b4c29f203ac.zip
Make template CFLAGS handling consistent.
Diffstat (limited to 'src')
-rw-r--r--src/template/aix12
-rw-r--r--src/template/cygwin2
-rw-r--r--src/template/freebsd2
-rw-r--r--src/template/hpux2
-rw-r--r--src/template/osf2
-rw-r--r--src/template/solaris2
-rw-r--r--src/template/univel2
-rw-r--r--src/template/unixware2
8 files changed, 13 insertions, 13 deletions
diff --git a/src/template/aix b/src/template/aix
index 768d38d88df..bdd7b08cb8d 100644
--- a/src/template/aix
+++ b/src/template/aix
@@ -1,9 +1,9 @@
if test "$GCC" = yes ; then
- CFLAGS='-O2 -pipe'
-else # not GCC
- CFLAGS='-O2 -qmaxmem=16384 -qsrcmsg -qlonglong'
+ CFLAGS="$CFLAGS -pipe"
+else
case $host_os in
- aix3.2.5 | aix4.1*)
- CFLAGS='-qmaxmem=16384 -qsrcmsg' ;;
+ aix3.2.5 | aix4.1*) ;;
+ *) CFLAGS="$CFLAGS -O2 -qlonglong";;
esac
-fi # not GCC
+ CFLAGS="$CFLAGS -qmaxmem=16384 -qsrcmsg"
+fi
diff --git a/src/template/cygwin b/src/template/cygwin
index 8a9fa0051ea..9b342ba8ab5 100644
--- a/src/template/cygwin
+++ b/src/template/cygwin
@@ -1 +1 @@
-SRCH_LIB='/usr/local/lib'
+SRCH_LIB="/usr/local/lib"
diff --git a/src/template/freebsd b/src/template/freebsd
index 6780a8ed472..fd9b3b96d5a 100644
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -1,7 +1,7 @@
CFLAGS="$CFLAGS -pipe"
case $host_cpu in
- alpha*) CFLAGS="$CFLAGS -O";;
+ alpha*) CFLAGS="$CFLAGS -O";; # alpha has problems with -O2
esac
THREAD_SUPPORT=yes
diff --git a/src/template/hpux b/src/template/hpux
index 28d836e0120..a461df0dcd7 100644
--- a/src/template/hpux
+++ b/src/template/hpux
@@ -2,5 +2,5 @@ CPPFLAGS="-D_XOPEN_SOURCE_EXTENDED"
if test "$GCC" != yes ; then
CC="$CC -Ae"
- CFLAGS="+O2"
+ CFLAGS="$CFLAGS +O2"
fi
diff --git a/src/template/osf b/src/template/osf
index 133a4516ab0..2b4dee1546b 100644
--- a/src/template/osf
+++ b/src/template/osf
@@ -1,6 +1,6 @@
if test "$GCC" != yes ; then
CC="$CC -std"
- CFLAGS='-O4 -Olimit 2000'
+ CFLAGS="$CFLAGS -O4 -Olimit 2000"
fi
THREAD_SUPPORT=yes
diff --git a/src/template/solaris b/src/template/solaris
index f5ff36064be..5264f749859 100644
--- a/src/template/solaris
+++ b/src/template/solaris
@@ -1,6 +1,6 @@
if test "$GCC" != yes ; then
CC="$CC -Xa" # relaxed ISO C mode
- CFLAGS="-O -v" # -v is like gcc -Wall
+ CFLAGS="$CFLAGS -O -v" # -v is like gcc -Wall
fi
THREAD_SUPPORT=yes
diff --git a/src/template/univel b/src/template/univel
index d48aa7c3111..12d11496735 100644
--- a/src/template/univel
+++ b/src/template/univel
@@ -1,2 +1,2 @@
-CFLAGS='-v -O -K i486,host,inline,loop_unroll -Dsvr4'
+CFLAGS="$CFLAGS -v -O -K i486,host,inline,loop_unroll -Dsvr4"
LIBS="-lc89"
diff --git a/src/template/unixware b/src/template/unixware
index cb1381d8fbd..8ad4a745d2e 100644
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -4,7 +4,7 @@ else
# the -Kno_host is temporary for a bug in the compiler. See -hackers
# discussion on 7-8/Aug/2003.
# when the 7.1.3UP3 or later compiler is out, we can do a version check.
- CFLAGS='-O -Kinline,no_host'
+ CFLAGS="$CFLAGS -O -Kinline,no_host"
THREAD_CPPFLAGS="-K pthread"
fi