diff --git a/configure b/configure
index a33b401d1cdecc..9057cebd16d6db 100755
--- a/configure
+++ b/configure
@@ -7323,6 +7323,9 @@ fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXEEXT" >&5
 printf "%s\n" "$EXEEXT" >&6; }
 
+# Make sure we keep EXEEXT and ac_exeext sync'ed.
+ac_exeext=$EXEEXT
+
 # Test whether we're running on a non-case-sensitive system, in which
 # case we give a warning if no ext is given
 
diff --git a/configure.ac b/configure.ac
index d1f8e8e8733ed8..0fc039e3d61416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1339,6 +1339,9 @@ AC_ARG_WITH([suffix],
 ])
 AC_MSG_RESULT([$EXEEXT])
 
+# Make sure we keep EXEEXT and ac_exeext sync'ed.
+AS_VAR_SET([ac_exeext], [$EXEEXT])
+
 # Test whether we're running on a non-case-sensitive system, in which
 # case we give a warning if no ext is given
 AC_SUBST([BUILDEXEEXT])