diff --git a/aclocal.m4 b/aclocal.m4
index feb4f3805157352f69707ff57120c15e7b86582c..7224cd5b3b657d6bff84cf4a27b75c8679309ef1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -452,6 +452,7 @@ AC_DEFUN([FP_SETTINGS],
         mingw_bin_prefix=mingw/bin/
         SettingsCCompilerCommand="\$topdir/../${mingw_bin_prefix}gcc.exe"
         SettingsHaskellCPPCommand="\$topdir/../${mingw_bin_prefix}gcc.exe"
+        SettingsHaskellCPPFlags="$HaskellCPPArgs"
         SettingsLdCommand="\$topdir/../${mingw_bin_prefix}ld.exe"
         SettingsArCommand="\$topdir/../${mingw_bin_prefix}ar.exe"
         SettingsPerlCommand='$topdir/../perl/perl.exe'
diff --git a/configure.ac b/configure.ac
index 3ac1cbd66c2c51b3421d80f607382c17280b1d54..f1b949bcfa3ca4114bd013b19c77b0662eebc46f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,10 +493,7 @@ AC_ARG_WITH(hs-cpp,
     fi
 ],
 [
-    if test "$HostOS" != "mingw32"
-    then
         HaskellCPPCmd=$WhatGccIsCalled
-    fi
 ]
 )