[project @ 2001-06-29 15:10:14 by simonmar]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index 276804f..dd140fe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -511,6 +511,19 @@ esac
 dnl ** does #! path/to/perl work? (sometimes it's too long...)
 FPTOOLS_SHEBANG_PERL
 
+dnl ** set up extra GCC options on Win32
+case $HostOS_CPP in
+cygwin32|mingw32)
+   STD_CC_OPTS="-mno-cygwin $CC_MWIN32_FLAG"
+   CFLAGS="$STD_CC_OPTS $CFLAGS"
+   CPPFLAGS="$STD_CC_OPTS $CPPFLAGS"
+   ;;
+*)
+   STD_CC_OPTS=""
+   ;;
+esac
+SRC_CC_OPTS="-O $STD_CC_OPTS"
+AC_SUBST(SRC_CC_OPTS)
 
 dnl ** look for GCC and find out which version
 dnl     Figure out which C compiler to use.  Gcc is preferred.
@@ -525,20 +538,11 @@ FPTOOLS_CC_MWIN32
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
 
+dnl ** set up extra GCC options on Win32
 case $HostOS_CPP in
 cygwin32|mingw32)
-   STD_CC_OPTS="-O -mno-cygwin $CC_MWIN32_FLAG"
    CPP="$CPP $STD_CC_OPTS"
-   CFLAGS="$STD_CC_OPTS $CFLAGS"
-   CPPFLAGS="$STD_CC_OPTS $CPPFLAGS"
-   ;;
-*)
-   STD_CC_OPTS=""
-   ;;
 esac
-SRC_CC_OPTS="-O $STD_CC_OPTS"
-AC_SUBST(SRC_CC_OPTS)
-
 
 dnl ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF