diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-06-29 10:07:32 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-06-29 10:07:32 +0200 |
| commit | 3f88d51e025bcbdb03119352c436ef0c922f6e91 (patch) | |
| tree | f5f1b8420618fc2d2aec898bdd4e34285df81815 /pkgs/development/compilers/gcc/10/default.nix | |
| parent | cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c (diff) | |
gcc10: 10.3.0 -> 10.4.0
Patches: the two seemed included in the release; I also checked that the conditional patches still all apply.
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 82269a395fee2..1b9f542894e07 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -53,11 +53,11 @@ with lib; with builtins; let majorVersion = "10"; - version = "${majorVersion}.3.0"; + version = "${majorVersion}.4.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = [ ./gcc10-asan-glibc-2.34.patch ] + patches = [ ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch @@ -73,8 +73,6 @@ let majorVersion = "10"; # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch - ++ [ ../libsanitizer-no-cyclades.patch ] - ++ optional (buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch { url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch"; sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA="; @@ -95,7 +93,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0i6378ig6h397zkhd7m4ccwjx5alvzrf2hm27p1pzwjhlv0h9x34"; + sha256 = "1wg4xdizkksmwi66mvv2v4pk3ja8x64m7v9gzhykzd3wrmdpsaf9"; }; inherit patches; |