[commit: ghc] master: Fix windows breakage (fallout from 34f7e9a3c998) (0567a31)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0567a3133bfd3f2085d2fc0211e91eaed96a3e83/ghc

>---------------------------------------------------------------

commit 0567a3133bfd3f2085d2fc0211e91eaed96a3e83
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Jul 4 09:40:25 2014 -0500

    Fix windows breakage (fallout from 34f7e9a3c998)
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

0567a3133bfd3f2085d2fc0211e91eaed96a3e83
 aclocal.m4   | 1 +
 configure.ac | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 1a7872e..d857706 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -455,6 +455,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 34cc02e..5fc5733 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
 ]
 )