If compiling with g++ don't use -Wstrict-prototpes.

This commit is contained in:
Skip Montanaro 2006-04-13 02:00:56 +00:00
parent 57fdcbc60f
commit 288a5be5ad
2 changed files with 13 additions and 7 deletions

11
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 45264 . # From configure.in Revision: 45278 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.5. # Generated by GNU Autoconf 2.59 for python 2.5.
# #
@ -3792,18 +3792,21 @@ if test -z "$OPT"
then then
case $GCC in case $GCC in
yes) yes)
if test "$CC" != 'g++' ; then
STRICT_PROTO="-Wstrict-prototypes"
fi
case $ac_cv_prog_cc_g in case $ac_cv_prog_cc_g in
yes) yes)
if test "$Py_DEBUG" = 'true' ; then if test "$Py_DEBUG" = 'true' ; then
# Optimization messes up debuggers, so turn it off for # Optimization messes up debuggers, so turn it off for
# debug builds. # debug builds.
OPT="-g -Wall -Wstrict-prototypes" OPT="-g -Wall $STRICT_PROTO"
else else
OPT="-g -O3 -Wall -Wstrict-prototypes" OPT="-g -O3 -Wall $STRICT_PROTO"
fi fi
;; ;;
*) *)
OPT="-O3 -Wall -Wstrict-prototypes" OPT="-O3 -Wall $STRICT_PROTO"
;; ;;
esac esac
case $ac_sys_system in case $ac_sys_system in

View File

@ -685,18 +685,21 @@ if test -z "$OPT"
then then
case $GCC in case $GCC in
yes) yes)
if test "$CC" != 'g++' ; then
STRICT_PROTO="-Wstrict-prototypes"
fi
case $ac_cv_prog_cc_g in case $ac_cv_prog_cc_g in
yes) yes)
if test "$Py_DEBUG" = 'true' ; then if test "$Py_DEBUG" = 'true' ; then
# Optimization messes up debuggers, so turn it off for # Optimization messes up debuggers, so turn it off for
# debug builds. # debug builds.
OPT="-g -Wall -Wstrict-prototypes" OPT="-g -Wall $STRICT_PROTO"
else else
OPT="-g -O3 -Wall -Wstrict-prototypes" OPT="-g -O3 -Wall $STRICT_PROTO"
fi fi
;; ;;
*) *)
OPT="-O3 -Wall -Wstrict-prototypes" OPT="-O3 -Wall $STRICT_PROTO"
;; ;;
esac esac
case $ac_sys_system in case $ac_sys_system in