summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-01-07 18:49:29 -0600
committerWill Dietz <w@wdtz.org>2018-02-13 09:44:39 -0600
commitff9b494103c6439795a4bed506e08945c92d19c2 (patch)
tree74d47b113bcea3d0c745b887bd963aa2c6853cf0 /pkgs/development
parentf146a3c31661e6ed9d4b964d7dd00e7838133d2f (diff)
downloadnixlib-ff9b494103c6439795a4bed506e08945c92d19c2.tar
nixlib-ff9b494103c6439795a4bed506e08945c92d19c2.tar.gz
nixlib-ff9b494103c6439795a4bed506e08945c92d19c2.tar.bz2
nixlib-ff9b494103c6439795a4bed506e08945c92d19c2.tar.lz
nixlib-ff9b494103c6439795a4bed506e08945c92d19c2.tar.xz
nixlib-ff9b494103c6439795a4bed506e08945c92d19c2.tar.zst
nixlib-ff9b494103c6439795a4bed506e08945c92d19c2.zip
gcc7: Apply patch to fix selftest w/musl?
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/gcc/7/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 3f6aeeeabcd0..5a1152cffb5d 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
@@ -67,6 +67,10 @@ let version = "7.3.0";
       [ ]
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
+      ++ optional (targetPlatform.libc == "musl") (fetchpatch {
+        url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
+        sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
+      })
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch