[commit: ghc] wip/fix-windows-ci, wip/revert-windows-big-pe: Try using Tamar's binutils branch (cf76e25)

git at git.haskell.org git at git.haskell.org
Thu Dec 27 17:00:57 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branches: wip/fix-windows-ci,wip/revert-windows-big-pe
Link       : http://ghc.haskell.org/trac/ghc/changeset/cf76e25321975ae519002de7bbd234fcb7c3ae25/ghc

>---------------------------------------------------------------

commit cf76e25321975ae519002de7bbd234fcb7c3ae25
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 24 12:53:11 2018 -0500

    Try using Tamar's binutils branch


>---------------------------------------------------------------

cf76e25321975ae519002de7bbd234fcb7c3ae25
 mk/get-win32-tarballs.sh | 7 ++++++-
 mk/win32-tarballs.md5sum | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mk/get-win32-tarballs.sh b/mk/get-win32-tarballs.sh
index 32f2705..c0e5dd7 100755
--- a/mk/get-win32-tarballs.sh
+++ b/mk/get-win32-tarballs.sh
@@ -109,7 +109,12 @@ download_tarballs() {
     download_mingw "${format_url}-isl-0.18-1-any.pkg.tar.xz"
     download_mingw "${format_url}-mpfr-3.1.6-1-any.pkg.tar.xz"
     download_mingw "${format_url}-gmp-6.1.2-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-binutils-2.29.1-1-any.pkg.tar.xz"
+    if test "$mingw_arch" = "x86_64"; then
+        # Try using Tamar's branch
+        download_mingw "${format_url}-binutils-git-2.25.r93824.012da41a23-1-any.pkg.tar.xz"
+    else
+        download_mingw "${format_url}-binutils-2.29.1-1-any.pkg.tar.xz"
+    fi
     download_mingw "${format_url}-libidn2-2.0.4-1-any.pkg.tar.xz"
     download_mingw "${format_url}-gcc-7.2.0-1-any.pkg.tar.xz"
 
diff --git a/mk/win32-tarballs.md5sum b/mk/win32-tarballs.md5sum
index 2c2d3df..ff155bc 100644
--- a/mk/win32-tarballs.md5sum
+++ b/mk/win32-tarballs.md5sum
@@ -37,3 +37,4 @@ d15495e807e2a87b917febedbfb3f5b3 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-
 c5ffd1a27eb459242b46d76b066e557e ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-winpthreads-git-5.0.0.4850.d1662dc7-1-any.pkg.tar.xz
 60c3a388478f411b7a0908441ebeb537 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-zlib-1.2.8-9-any.pkg.tar.xz
 b21d1681b61cf7a024e854096285b02e ghc-tarballs/perl/ghc-perl-1.tar.gz
+aafbf4921f121d79ef57621bb80b4b51 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-binutils-git-2.25.r93824.012da41a23-1-any.pkg.tar.xz



More information about the ghc-commits mailing list