Commit 579b72c5 authored by Tom Lane's avatar Tom Lane

Run AC_PROG_GCC_TRADITIONAL only when running AC_PROG_CC,

ie, not when user specifies --with-CC.  This corrects a scripting error
that I'm surprised hasn't been reported more often.  Moving the macro call
to the earlier point in the script is correct anyway: if -traditional is needed,
it should get added to CFLAGS before we start using the compiler for
other tests.
parent 9e38dcfd
...@@ -335,7 +335,10 @@ AC_ARG_WITH(CC, ...@@ -335,7 +335,10 @@ AC_ARG_WITH(CC,
esac esac
CC="$withval" CC="$withval"
], ],
[ AC_PROG_CC]) [
AC_PROG_CC
AC_PROG_GCC_TRADITIONAL
])
if test "$CC" = "gcc" if test "$CC" = "gcc"
then then
...@@ -346,11 +349,9 @@ fi ...@@ -346,11 +349,9 @@ fi
AC_SUBST(CC_VERSION) AC_SUBST(CC_VERSION)
CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS" CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS"
export CPPFLAGS
echo "- setting CPPFLAGS=$CPPFLAGS" echo "- setting CPPFLAGS=$CPPFLAGS"
LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
export LDFLAGS
echo "- setting LDFLAGS=$LDFLAGS" echo "- setting LDFLAGS=$LDFLAGS"
dnl Checks for programs. dnl Checks for programs.
...@@ -668,7 +669,6 @@ main() { ...@@ -668,7 +669,6 @@ main() {
AC_MSG_RESULT(assuming not on target machine)) AC_MSG_RESULT(assuming not on target machine))
dnl Checks for library functions. dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment