Merge pull request #40933 from obsidiansystems/linux-to-darwin

stdenv, binutils: Build cctools targeting macOS on Linux without pointless rebuilds
2018-05-23 11:37:43 -04:00
parent d6b9e625d5 4ffa8b6125
commit ee9dc37e04
2 changed files with 11 additions and 5 deletions
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -19,10 +19,11 @@ in
 stdenv.mkDerivation rec {
  name = targetPrefix + basename;

-  src = fetchurl {
+  # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
+  src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
    url = "mirror://gnu/binutils/${basename}.tar.bz2";
    sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg";
-  };
+  });

  patches = [
    # Turn on --enable-new-dtags by default to make the linker set