From 6f295328e57e9d8cf637fad1a3d40b1fc9624eec Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 2 Feb 2004 04:07:18 +0000
Subject: [PATCH] Do not let external specification of CFLAGS stop us from
adding -fno-strict-aliasing.
---
config/c-compiler.m4 | 4 ++--
configure | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index 269b4e74dc7..2acd3cd04af 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -1,5 +1,5 @@
# Macros to detect C compiler features
-# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.11 2003/11/29 19:51:17 pgsql Exp $
+# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.12 2004/02/02 04:07:18 tgl Exp $
# PGAC_C_SIGNED
@@ -146,7 +146,7 @@ done
CFLAGS=$pgac_save_CFLAGS
])
-if test "$ac_env_CFLAGS_set" != set; then
+if test x"$pgac_cv_prog_cc_no_strict_aliasing" != x""; then
CFLAGS="$CFLAGS $pgac_cv_prog_cc_no_strict_aliasing"
fi])# PGAC_PROG_CC_NO_STRICT_ALIASING
diff --git a/configure b/configure
index b691160818c..681d7163394 100755
--- a/configure
+++ b/configure
@@ -2488,7 +2488,7 @@ fi
echo "$as_me:$LINENO: result: $pgac_cv_prog_cc_no_strict_aliasing" >&5
echo "${ECHO_T}$pgac_cv_prog_cc_no_strict_aliasing" >&6
-if test "$ac_env_CFLAGS_set" != set; then
+if test x"$pgac_cv_prog_cc_no_strict_aliasing" != x""; then
CFLAGS="$CFLAGS $pgac_cv_prog_cc_no_strict_aliasing"
fi
@@ -2502,7 +2502,7 @@ echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
# We already have this in Makefile.win32, but configure needs it too
if test "$PORTNAME" = "win32"; then
- CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32 -DEXEC_BACKEND"
+ CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
fi
# Check if the compiler still works with the template settings
@@ -12079,7 +12079,6 @@ esac
case $host_os in mingw*)
LIBOBJS="$LIBOBJS dirmod.$ac_objext"
LIBOBJS="$LIBOBJS copydir.$ac_objext"
-LIBOBJS="$LIBOBJS rand.$ac_objext"
LIBOBJS="$LIBOBJS gettimeofday.$ac_objext"
LIBOBJS="$LIBOBJS pipe.$ac_objext" ;;
esac
--
GitLab