From fecd326399d72ecf0e5356f60aec7d79a0b7b7ef Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 24 Sep 2018 20:03:50 -0500 Subject: gcc{5,6,7,8}: share libgomp patch, propagate musl config flags --- pkgs/development/compilers/gcc/7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers/gcc/7/default.nix') diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 6643d41ff77c..fd3ce8df497d 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -57,7 +57,7 @@ let version = "7.3.0"; }) ++ 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") ../libgomp-dont-force-initial-exec.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; -- cgit 1.4.1