diff --git a/configure.ac b/configure.ac
index 2f1764ac09cc..f0a4b641edab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5949,14 +5949,18 @@ AC_SUBST(BUILDING_PCH_WITH_OBJ)
 
 PCH_CODEGEN=
 PCH_NO_CODEGEN=
+fpch_prefix=
+if test "$COM" = MSC; then
+    fpch_prefix="-Xclang "
+fi
 if test -n "$BUILDING_PCH_WITH_OBJ"; then
-    AC_MSG_CHECKING([whether $CC supports -fpch-codegen])
+    AC_MSG_CHECKING([whether $CC supports ${fpch_prefix}-fpch-codegen])
     save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Werror -fpch-codegen"
+    CFLAGS="$CFLAGS -Werror ${fpch_prefix}-fpch-codegen"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],
         [
-        PCH_CODEGEN="-fpch-codegen"
-        PCH_NO_CODEGEN="-fno-pch-codegen"
+        PCH_CODEGEN="${fpch_prefix}-fpch-codegen"
+        PCH_NO_CODEGEN="${fpch_prefix}-fno-pch-codegen"
         ],[])
     CFLAGS=$save_CFLAGS
     if test -n "$PCH_CODEGEN"; then
@@ -5969,10 +5973,10 @@ AC_SUBST(PCH_CODEGEN)
 AC_SUBST(PCH_NO_CODEGEN)
 PCH_DEBUGINFO=
 if test -n "$BUILDING_PCH_WITH_OBJ"; then
-    AC_MSG_CHECKING([whether $CC supports -fpch-debuginfo])
+    AC_MSG_CHECKING([whether $CC supports ${fpch_prefix}-fpch-debuginfo])
     save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Werror -fpch-debuginfo"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ PCH_DEBUGINFO="-fpch-debuginfo" ],[])
+    CFLAGS="$CFLAGS -Werror ${fpch_prefix}-fpch-debuginfo"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ PCH_DEBUGINFO="${fpch_prefix}-fpch-debuginfo" ],[])
     CFLAGS=$save_CFLAGS
     if test -n "$PCH_DEBUGINFO"; then
         AC_MSG_RESULT(yes)