commit d3e2dd7fad0c5a6fc0171719b6eb3f9e0883d84f Author: Nicolas Vigier boklm@torproject.org Date: Wed Feb 28 12:02:33 2018 +0100

Bug 25420: update gcc to 6.4.0 for the Windows build --- projects/mingw-w64/build | 2 +- projects/mingw-w64/config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 8d3e567..8ce5048 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -21,7 +21,7 @@ make install cd /var/tmp/build mkdir gcc cd gcc -tar xjf $rootdir/gcc-[% c("var/gcc_version") %].tar.bz2 +tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz # We don't want to link against msvcrt.dll due to bug 9084. [% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 5bfc93f..01d0c37 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -6,7 +6,7 @@ version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 5.4.0 + gcc_version: 6.4.0 deps: - automake - build-essential @@ -30,7 +30,7 @@ targets: - g++-mingw-w64-x86-64 input_files: - project: container-image - - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-%5B% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.bz2' - sha256sum: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a + - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-%5B% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' + sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 - name: binutils project: binutils