public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60552 from matthewbauer/binutils-fix-darwin-build 

binutils: apply patch when cross compiling from darwin
This commit is contained in:
Matthew Bauer 2019-05-06 15:53:58 -04:00 committed by GitHub
parent 864f4f084a 457b48cc03
commit e487f93c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/misc/binutils/default.nix
View File

@ -4,6 +4,7 @@
, withAllTargets ? false, libbfd, libopcodes , withAllTargets ? false, libbfd, libopcodes
, enableShared ? true , enableShared ? true
, noSysDirs, gold ? true, bison ? null , noSysDirs, gold ? true, bison ? null
, fetchpatch
}: }:
let let
@ -60,7 +61,14 @@ stdenv.mkDerivation rec {
./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch ./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-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.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" ]; outputs = [ "out" "info" "man" ];