diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 5931402b98..688e745d95 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -308,7 +308,7 @@ (define-public webkitgtk
              (setenv "CXX" "clang++")
              ;; XXX Until we switch back to using GCC,
              ;; work around <https://bugs.gnu.org/51591>.
-             ,@(if (string=? "i686-linux" (%current-system))
+             ,@(if (target-x86-32?)
                    '((substitute* "Source/WTF/wtf/CheckedArithmetic.h"
                        (("#define USE_MUL_OVERFLOW 1")
                         "#define USE_MUL_OVERFLOW 0")))