diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-07 19:30:14 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-07 19:30:14 +0200 |
| commit | 87a5d8fedeb4949234a84206f3da9f3d882d1111 (patch) | |
| tree | 1ad4a4072d0117e6a6ace03edd3469940b9cacf6 /pkgs/development/tools/misc/binutils | |
| parent | 9ab5d019759f7b298461c99013e0b939c6a75b42 (diff) | |
| parent | 3c1a202a165886b2ea61d881f002226bd58427d2 (diff) | |
| download | nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.gz nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.bz2 nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.lz nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.xz nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.zst nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/misc/binutils')
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 89fc72cbba2..0bead8d65f7 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -4,6 +4,7 @@ , withAllTargets ? false, libbfd, libopcodes , enableShared ? true , noSysDirs, gold ? true, bison ? null +, fetchpatch }: let @@ -60,7 +61,14 @@ stdenv.mkDerivation rec { ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch - ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; + ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.targetPlatform != stdenv.hostPlatform) [ + (fetchpatch { + url = "https://sourceware.org/bugzilla/attachment.cgi?id=11141"; + name = "gold-threads.patch"; + sha256 = "0p26dxpba8n7z3pwjg7qf94f0gzbvwkjq0j9ng1w3sljj0gyaf1j"; + }) + ]; outputs = [ "out" "info" "man" ]; |