diff --git a/configure.in b/configure.in
index c62f6c3c305..cfb12611119 100644
--- a/configure.in
+++ b/configure.in
@@ -2304,4 +2304,5 @@ fi
 # This is how we know whether to re-run configure in certain cases.
 touch src/config.stamp
 
-], [CPP="$CPP" CPPFLAGS="$CPPFLAGS"])
+], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS"])
+