From ff5e4de4e3f3bcd04739ca77ca4c5dda375b85f2 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 19 Jan 2011 13:50:53 +0000 Subject: [PATCH] update to mingw gcc 4.5.2 --- configure.ac | 2 ++ driver/gcc/gcc.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ea06662..937d871 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 d9e73a7..ea1f480 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); } -- 1.7.10.4