Merge remote-tracking branch 'upstream/master' into staging

2018-05-14 13:31:20 -04:00
parent d00cc1242f 405f9d10ef
commit 01a525b84e
12 changed files with 22 additions and 50 deletions
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -194,11 +194,7 @@ stdenv.mkDerivation ({
  libc_dev = stdenv.cc.libc_dev;

  postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
    then
      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
      # in glibc, so add the right `-I' flags to the default spec string.