diff options
| author | Will Dietz <github@wdtz.org> | 2018-11-02 04:00:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 04:00:30 -0500 |
| commit | 0c1b8e877013c0a2edb852c20e77ca33b9869681 (patch) | |
| tree | d49786bdba474c5711003542a5f90926722b22c8 /pkgs/development/compilers/gcc | |
| parent | 3b056514a7312b0e4ff19e47e1a4078b889e7a54 (diff) | |
| parent | 00a51a9669c0883b13a7bb5273641c3f8cd29694 (diff) | |
| download | nixlib-0c1b8e877013c0a2edb852c20e77ca33b9869681.tar nixlib-0c1b8e877013c0a2edb852c20e77ca33b9869681.tar.gz nixlib-0c1b8e877013c0a2edb852c20e77ca33b9869681.tar.bz2 nixlib-0c1b8e877013c0a2edb852c20e77ca33b9869681.tar.lz nixlib-0c1b8e877013c0a2edb852c20e77ca33b9869681.tar.xz nixlib-0c1b8e877013c0a2edb852c20e77ca33b9869681.tar.zst nixlib-0c1b8e877013c0a2edb852c20e77ca33b9869681.zip | |
Merge pull request #49455 from dtzWill/update/gcc-6.5
gcc6: 6.4.0 -> 6.5.0
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 1af3419bd8d3..5d7549ed1157 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -48,7 +48,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "6.4.0"; +let version = "6.5.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -57,8 +57,6 @@ let version = "6.4.0"; ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch - ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26 - ++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26 ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch ; @@ -168,7 +166,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5"; + sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; }; inherit patches; |