X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=e89a2fe4ca1b73c7f8ce0e8a1622e3d2eb8a47a9;hb=c50bc4658e3801442b4581bd1d9a19f67567cdda;hp=b943d4d9343355dd2bf015cf7f7bf739d98bc645;hpb=0f9cb5077d477f9d04ad58066525d24da389320a;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index b943d4d..e89a2fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,6 +387,8 @@ FP_FIND_ROOT
 
 if test "$HostOS" = "mingw32"
 then
+    test -d inplace || mkdir inplace
+
     CC="$hardtop/inplace/mingw/bin/gcc.exe"
     LD="$hardtop/inplace/mingw/bin/ld.exe"
     NM="$hardtop/inplace/mingw/bin/nm.exe"
@@ -404,7 +406,6 @@ then
     then
         AC_MSG_NOTICE([Making in-tree mingw tree])
         rm -rf inplace/mingw
-        test -d inplace || mkdir inplace
         mkdir inplace/mingw
         (
             cd inplace/mingw &&
@@ -529,11 +530,11 @@ dnl     If gcc, make sure it's at least 2.1
 dnl
 FP_HAVE_GCC
 
-FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS])
-FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0])
-FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1])
+FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[CPPFLAGS])
+FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0],[CONF_CPP_OPTS_STAGE0])
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1],[CONF_CPP_OPTS_STAGE1])
 # Stage 3 won't be supported by cross-compilation
-FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2])
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2],[CONF_CPP_OPTS_STAGE2])
 
 FP_GCC_EXTRA_FLAGS
 
@@ -546,6 +547,9 @@ AC_SUBST(CONF_CC_OPTS_STAGE2)
 AC_SUBST(CONF_LD_OPTS_STAGE0)
 AC_SUBST(CONF_LD_OPTS_STAGE1)
 AC_SUBST(CONF_LD_OPTS_STAGE2)
+AC_SUBST(CONF_CPP_OPTS_STAGE0)
+AC_SUBST(CONF_CPP_OPTS_STAGE1)
+AC_SUBST(CONF_CPP_OPTS_STAGE2)
 
 dnl ** figure out how to do context diffs
 FP_PROG_CONTEXT_DIFF