[Python-checkins] bpo-5755: Move -Wstrict-prototypes to CFLAGS_NODIST (GH-7395)

Tue Jun 5 20:12:09 EDT 2018

https://github.com/python/cpython/commit/d6e789c402330905b1bd9103538d1027fcfb08a4
commit: d6e789c402330905b1bd9103538d1027fcfb08a4
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年06月05日T17:12:06-07:00
summary:
bpo-5755: Move -Wstrict-prototypes to CFLAGS_NODIST (GH-7395)
(cherry picked from commit e33648484775fa533fc8f1e5cc45f60061d29d54)
Co-authored-by: INADA Naoki <methane at users.noreply.github.com>
files:
A Misc/NEWS.d/next/Build/2018-06-04-21-34-34.bpo-5755.65GmCj.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2018-06-04-21-34-34.bpo-5755.65GmCj.rst b/Misc/NEWS.d/next/Build/2018-06-04-21-34-34.bpo-5755.65GmCj.rst
new file mode 100644
index 000000000000..8bcad4418baf
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2018-06-04-21-34-34.bpo-5755.65GmCj.rst
@@ -0,0 +1,3 @@
+Move ``-Wstrict-prototypes`` option to ``CFLAGS_NODIST`` from ``OPT``. This
+option emitted annoying warnings when building extension modules written in
+C++.
diff --git a/configure b/configure
index fc70866aa014..5a2afe57f535 100755
--- a/configure
+++ b/configure
@@ -6731,9 +6731,6 @@ if test "${OPT-unset}" = "unset"
 then
 case $GCC in
 yes)
- if test "$CC" != 'g++' ; then
-	 STRICT_PROTO="-Wstrict-prototypes"
-	fi
 # For gcc 4.x we need to use -fwrapv so lets check if its supported
 if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then
 WRAP="-fwrapv"
@@ -6780,8 +6777,6 @@ then
 	 ;;
 	esac
 
-	OPT="$OPT $STRICT_PROTO"
-
 	case $ac_sys_system in
 	 SCO_SV*) OPT="$OPT -m486 -DSCO5"
 	 ;;
@@ -7190,6 +7185,47 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
 $as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }
 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC strict-prototypes warning" >&5
+$as_echo_n "checking if we can turn on $CC strict-prototypes warning... " >&6; }
+ ac_save_cc="$CC"
+ CC="$CC -Werror -Wstrict-prototypes"
+ if ${ac_cv_enable_enable_strict_prototypes_warning+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ ac_cv_enable_strict_prototypes_warning=yes
+
+else
+
+ ac_cv_enable_strict_prototypes_warning=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ CC="$ac_save_cc"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5
+$as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; }
+
+ if test $ac_cv_enable_strict_prototypes_warning = yes
+ then
+ CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes"
+ fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5
 $as_echo_n "checking if we can make implicit function declaration an error in $CC... " >&6; }
 ac_save_cc="$CC"
diff --git a/configure.ac b/configure.ac
index bb89477ec318..c844eb105c37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1458,9 +1458,6 @@ if test "${OPT-unset}" = "unset"
 then
 case $GCC in
 yes)
- if test "$CC" != 'g++' ; then
-	 STRICT_PROTO="-Wstrict-prototypes"
-	fi
 # For gcc 4.x we need to use -fwrapv so lets check if its supported
 if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then
 WRAP="-fwrapv"
@@ -1507,8 +1504,6 @@ then
 	 ;;
 	esac
 
-	OPT="$OPT $STRICT_PROTO"
-
 	case $ac_sys_system in
 	 SCO_SV*) OPT="$OPT -m486 -DSCO5"
 	 ;;
@@ -1735,6 +1730,26 @@ yes)
 fi
 AC_MSG_RESULT($ac_cv_enable_unreachable_code_warning)
 
+ AC_MSG_CHECKING(if we can turn on $CC strict-prototypes warning)
+ ac_save_cc="$CC"
+ CC="$CC -Werror -Wstrict-prototypes"
+ AC_CACHE_VAL(ac_cv_enable_enable_strict_prototypes_warning,
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_PROGRAM([[]], [[]])
+ ],[
+ ac_cv_enable_strict_prototypes_warning=yes
+ ],[
+ ac_cv_enable_strict_prototypes_warning=no
+ ]))
+ CC="$ac_save_cc"
+ AC_MSG_RESULT($ac_cv_enable_strict_prototypes_warning)
+
+ if test $ac_cv_enable_strict_prototypes_warning = yes
+ then
+ CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes"
+ fi
+
 AC_MSG_CHECKING(if we can make implicit function declaration an error in $CC)
 ac_save_cc="$CC"
 CC="$CC -Werror=implicit-function-declaration"
