diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-10 21:49:26 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-11 11:24:35 -0400 |
| commit | 3c5188ccb6320ff2112fdf12354982d9c098754b (patch) | |
| tree | 0e8fba2e0eac34533b1cad1a9c179f3bae80a788 /pkgs/development/tools | |
| parent | 7c7ccd51f48e6a534d1e5464355d9b3441a96587 (diff) | |
| download | nixlib-3c5188ccb6320ff2112fdf12354982d9c098754b.tar nixlib-3c5188ccb6320ff2112fdf12354982d9c098754b.tar.gz nixlib-3c5188ccb6320ff2112fdf12354982d9c098754b.tar.bz2 nixlib-3c5188ccb6320ff2112fdf12354982d9c098754b.tar.lz nixlib-3c5188ccb6320ff2112fdf12354982d9c098754b.tar.xz nixlib-3c5188ccb6320ff2112fdf12354982d9c098754b.tar.zst nixlib-3c5188ccb6320ff2112fdf12354982d9c098754b.zip | |
binutils: disable gold when building on darwin
Needed to build anything, otherwise get this error: https://hydra.nixos.org/build/93192355/
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0c46ce20d0eb..91dbd9e314f3 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -3,7 +3,9 @@ # Enabling all targets increases output size to a multiple. , withAllTargets ? false, libbfd, libopcodes , enableShared ? true -, noSysDirs, gold ? true, bison ? null +, noSysDirs +, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform +, bison ? null , fetchpatch }: @@ -61,14 +63,7 @@ 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.hostPlatform.isDarwin && stdenv.targetPlatform != stdenv.hostPlatform) [ - (fetchpatch { - url = "https://sourceware.org/bugzilla/attachment.cgi?id=11141"; - name = "gold-threads.patch"; - sha256 = "0p26dxpba8n7z3pwjg7qf94f0gzbvwkjq0j9ng1w3sljj0gyaf1j"; - }) - ]; + ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; |