From 5964b3a2e21c9d9369b55bbf48dff71ff0671f25 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 5 May 2019 02:23:15 -0500 Subject: [PATCH] gcc9: drop gomp patch (musl) https://github.com/NixOS/nixpkgs/pull/60860#issuecomment-489495120 --- pkgs/development/compilers/gcc/9/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index b06dce1fe33..0d75de7557b 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -49,8 +49,7 @@ let version = "9.1.0"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ ++ optional langFortran ../gfortran-driving.patch - ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch - ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch; + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";