Do not let external specification of CFLAGS stop us from adding

-fno-strict-aliasing.

2 files changed, 3 insertions, 4 deletions

diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index 2f4a6a7224..dbacc927ca 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -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 b691160818..681d716339 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