X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=a8539fb1669033aebbfb090ccc37370bbe7510d2;hb=2b8358cfe8b6399874090c099e3b96e932c6ccbb;hp=ccc625fdccbc2125597de8178a9e29b7b82c3175;hpb=bed9246114cff5b4d22acc0ff7ecfdd4fc52a5c2;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index ccc625f..a8539fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,10 +426,14 @@ then
     NM="$hardtop/inplace/mingw/bin/nm.exe"
     fp_prog_ar_raw="$hardtop/inplace/mingw/bin/ar.exe"
     if ! test -d inplace/mingw ||
-         test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.lzma ||
-         test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.lzma ||
-         test inplace/mingw -ot ghc-tarballs/mingw/gcc-c++*.tar.lzma  ||
-         test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*.tar.gz    ||
+         test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.lzma  ||
+         test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.lzma  ||
+         test inplace/mingw -ot ghc-tarballs/mingw/gcc-c++*.tar.lzma   ||
+         test inplace/mingw -ot ghc-tarballs/mingw/libgmp*.tar.gz      ||
+         test inplace/mingw -ot ghc-tarballs/mingw/libmpc*.tar.gz      ||
+         test inplace/mingw -ot ghc-tarballs/mingw/libmpfr*.tar.gz     ||
+         test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dev.tar.gz ||
+         test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dll.tar.gz ||
          test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.lzma
     then
         AC_MSG_NOTICE([Making in-tree mingw tree])
@@ -438,14 +442,22 @@ then
         mkdir inplace/mingw
         (
             cd inplace/mingw &&
-            tar --lzma -xf ../../ghc-tarballs/mingw/binutils*.tar.lzma &&
-            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-core*.tar.lzma &&
-            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-c++*.tar.lzma  &&
-            tar -z     -xf ../../ghc-tarballs/mingw/mingwrt*.tar.gz    &&
-            tar --lzma -xf ../../ghc-tarballs/mingw/w32api*.tar.lzma   &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/binutils*.tar.lzma  &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-core*.tar.lzma  &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-c++*.tar.lzma   &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/libgmp*.tar.lzma    &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/libmpc*.tar.lzma    &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/libmpfr*.tar.lzma   &&
+            tar -z     -xf ../../ghc-tarballs/mingw/mingwrt*-dev.tar.gz &&
+            tar -z     -xf ../../ghc-tarballs/mingw/mingwrt*-dll.tar.gz &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/w32api*.tar.lzma    &&
             mv bin/gcc.exe bin/realgcc.exe
         )
-        inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
+        PATH=`pwd`/inplace/mingw/bin:$PATH inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
+        if ! test -e inplace/mingw/bin/gcc.exe
+        then
+            AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
+        fi
         AC_MSG_NOTICE([In-tree mingw tree created])
     fi
     if ! test -d inplace/perl ||