diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index fa7881e398a8..93c9dde61fc3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -78,7 +78,11 @@ let majorVersion = "6"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # 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 + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; + sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; + }); javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at |