mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-30 00:50:17 +02:00
gcc11: 11.1.0 -> 11.2.0
The cyclades patch has been applied upstream: * https://github.com/gcc-mirror/gcc/commit/2bf34b9f4e4
This commit is contained in:
parent
fbaf0c0f52
commit
e8abd9cc16
|
@ -57,7 +57,7 @@ with lib;
|
||||||
with builtins;
|
with builtins;
|
||||||
|
|
||||||
let majorVersion = "11";
|
let majorVersion = "11";
|
||||||
version = "${majorVersion}.1.0";
|
version = "${majorVersion}.2.0";
|
||||||
|
|
||||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||||
|
|
||||||
|
@ -78,9 +78,7 @@ let majorVersion = "11";
|
||||||
})
|
})
|
||||||
|
|
||||||
# Obtain latest patch with ../update-mcfgthread-patches.sh
|
# Obtain latest patch with ../update-mcfgthread-patches.sh
|
||||||
++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch
|
++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch;
|
||||||
|
|
||||||
++ [ ../libsanitizer-no-cyclades.patch ];
|
|
||||||
|
|
||||||
/* Cross-gcc settings (build == host != target) */
|
/* Cross-gcc settings (build == host != target) */
|
||||||
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
|
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
|
||||||
|
@ -97,7 +95,7 @@ stdenv.mkDerivation ({
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
|
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
|
||||||
sha256 = "1pwxrjhsymv90xzh0x42cxfnmhjinf2lnrrf3hj5jq1rm2w6yjjc";
|
sha256 = "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit patches;
|
inherit patches;
|
||||||
|
|
Loading…
Reference in a new issue