[Python-checkins] cpython (merge default -> default): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/63bf3bae20ef
changeset:   72381:63bf3bae20ef
parent:      72380:f325439d7f84
parent:      72378:637c67b34a1a
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Sep 14 11:46:17 2011 -0400
summary:
  merge heads

files:
  configure    |  6 ++++++
  configure.in |  6 ++++++
  2 files changed, 12 insertions(+), 0 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5450,6 +5450,12 @@
         if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then
            WRAP="-fwrapv"
         fi
+
+        # Clang also needs -fwrapv
+        if test "$CC" = "clang" ; then
+            WRAP="-fwrapv"
+        fi
+
 	case $ac_cv_prog_cc_g in
 	yes)
 	    if test "$Py_DEBUG" = 'true' ; then
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -905,6 +905,12 @@
         if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then
            WRAP="-fwrapv"
         fi
+
+        # Clang also needs -fwrapv
+        if test "$CC" = "clang" ; then
+            WRAP="-fwrapv"
+        fi
+
 	case $ac_cv_prog_cc_g in
 	yes)
 	    if test "$Py_DEBUG" = 'true' ; then

-- 
Repository URL: http://hg.python.org/cpython