diff --git a/configure b/configure
index eb5d19eee24..eb0ea7116e3 100755
--- a/configure
+++ b/configure
@@ -5498,9 +5498,10 @@ then
         fi
 
         # Clang also needs -fwrapv
-        if test "$CC" = "clang" ; then
-            WRAP="-fwrapv"
-        fi
+        case $CC in
+            *clang*) WRAP="-fwrapv"
+            ;;
+        esac
 
 	case $ac_cv_prog_cc_g in
 	yes)
diff --git a/configure.in b/configure.in
index 81de0d4749b..0efe7d1b5a8 100644
--- a/configure.in
+++ b/configure.in
@@ -928,9 +928,10 @@ then
         fi
 
         # Clang also needs -fwrapv
-        if test "$CC" = "clang" ; then
-            WRAP="-fwrapv"
-        fi
+        case $CC in
+            *clang*) WRAP="-fwrapv"
+            ;;
+        esac
 
 	case $ac_cv_prog_cc_g in
 	yes)