diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-01-19 13:50:53 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-01-19 13:50:53 +0000 |
| commit | ff5e4de4e3f3bcd04739ca77ca4c5dda375b85f2 (patch) | |
| tree | a19f9cba95531da88f143823893dedaaa3973b17 | |
| parent | 52567e9d746db8c523885b9491b79302064b4bd8 (diff) | |
| download | haskell-ff5e4de4e3f3bcd04739ca77ca4c5dda375b85f2.tar.gz | |
update to mingw gcc 4.5.2
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | driver/gcc/gcc.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ea06662c94..937d87175f 100644 --- a/configure.ac +++ b/configure.ac @@ -411,6 +411,7 @@ then 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/libgcc*.tar.gz || 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 || @@ -427,6 +428,7 @@ then 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/libgcc*.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 && diff --git a/driver/gcc/gcc.c b/driver/gcc/gcc.c index d9e73a7322..ea1f480b4d 100644 --- a/driver/gcc/gcc.c +++ b/driver/gcc/gcc.c @@ -47,8 +47,8 @@ int main(int argc, char** argv) { from that in preference to the in-tree files. */ preArgv[0] = mkString("-B%s", binDir); preArgv[1] = mkString("-B%s/../lib", binDir); - preArgv[2] = mkString("-B%s/../lib/gcc/mingw32/4.5.0", binDir); - preArgv[3] = mkString("-B%s/../libexec/gcc/mingw32/4.5.0", binDir); + preArgv[2] = mkString("-B%s/../lib/gcc/mingw32/4.5.2", binDir); + preArgv[3] = mkString("-B%s/../libexec/gcc/mingw32/4.5.2", binDir); run(exePath, 4, preArgv, argc - 1, argv + 1); } |