From 3c5188ccb6320ff2112fdf12354982d9c098754b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 10 May 2019 21:49:26 -0400 Subject: binutils: disable gold when building on darwin Needed to build anything, otherwise get this error: https://hydra.nixos.org/build/93192355/ --- pkgs/development/tools/misc/binutils/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'pkgs/development/tools') 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" ]; -- cgit 1.4.1