X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=384fd5fe4315864495d76d64e525419e6b6c9e34;hb=22dca36901bd0792b48a15ad0b252b5b173e57ba;hp=2b8d7c78900b452b2d8443e935fe602c891c02ab;hpb=984b949e3a84ef9f6455640fb3d2b69b7937bd6c;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 2b8d7c7..384fd5f 100644
--- a/configure.in
+++ b/configure.in
@@ -207,7 +207,6 @@ i[[3456]]86-*-mingw32*)
 	# the gcc command-line used here with -mno-cygwin to
 	# arrange for good things to happen.
 	CFLAGS="-mno-cygwin $CFLAGS"
-	CPPFLAGS="-mno-cygwin $CPPFLAGS"
         ;;
 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
@@ -511,6 +510,11 @@ FPTOOLS_HAVE_GCC
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
+case $HostOS_CPP in
+mingw32)
+   CPP="$CPP -mno-cygwin"
+   ;;
+esac
 
 dnl ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF
@@ -578,7 +582,7 @@ AC_SUBST(CompressSuffix)
 
 dnl ** check for installed happy binary + version
 dnl    (don't do it if we're booting from .hc files though.)
-if (test "$BootingFromHc" = "NO"); then
+if test "$BootingFromHc" = "NO"; then
 FPTOOLS_HAPPY
 fi;