diff --git a/configure b/configure
index 9a6407d2c6f..e2150f50aac 100755
--- a/configure
+++ b/configure
@@ -4318,7 +4318,6 @@ if test "${build}" != "${host}" ; then
   AR_FOR_BUILD=${AR_FOR_BUILD-ar}
   AS_FOR_BUILD=${AS_FOR_BUILD-as}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-  CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
   DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
   DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil}
@@ -4350,6 +4349,7 @@ else
   WINDRES_FOR_BUILD="${WINDRES_FOR_BUILD-\$(WINDRES)}"
   WINDMC_FOR_BUILD="${WINDMC_FOR_BUILD-\$(WINDMC)}"
 fi
+CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
diff --git a/configure.ac b/configure.ac
index 0854638e8e8..edd53b2bb42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1453,7 +1453,6 @@ if test "${build}" != "${host}" ; then
   AR_FOR_BUILD=${AR_FOR_BUILD-ar}
   AS_FOR_BUILD=${AS_FOR_BUILD-as}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-  CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
   DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
   DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil}
@@ -1485,6 +1484,7 @@ else
   WINDRES_FOR_BUILD="${WINDRES_FOR_BUILD-\$(WINDRES)}"
   WINDMC_FOR_BUILD="${WINDMC_FOR_BUILD-\$(WINDMC)}"
 fi
+CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
 
 AC_PROG_CC_C99
 AC_PROG_CXX