summary refs log tree commit diff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-21 20:26:37 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-21 20:30:25 -0400
commitafc439d57b3866cb499fe68b94f969079aba7963 (patch)
tree46f3943d1ccf1945e3e3576c9001699fa2f67d71 /pkgs/development/tools/misc
parent0106dfcbeb56742503a89309c60a95433514226e (diff)
downloadnixpkgs-afc439d57b3866cb499fe68b94f969079aba7963.tar
nixpkgs-afc439d57b3866cb499fe68b94f969079aba7963.tar.gz
nixpkgs-afc439d57b3866cb499fe68b94f969079aba7963.tar.bz2
nixpkgs-afc439d57b3866cb499fe68b94f969079aba7963.tar.lz
nixpkgs-afc439d57b3866cb499fe68b94f969079aba7963.tar.xz
nixpkgs-afc439d57b3866cb499fe68b94f969079aba7963.tar.zst
nixpkgs-afc439d57b3866cb499fe68b94f969079aba7963.zip
binutils: Always apply Aarch64 patch
Otherwise various things which depend on `--enable-targets=all`
lib{bfd,opcodes}...like LLVM.
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/binutils/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ac055171658..fb780734bd7 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -64,13 +64,12 @@ stdenv.mkDerivation rec {
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
     ./gold-symbol-visibility.patch
-  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch
-    ++ stdenv.lib.optionals targetPlatform.isAarch64 [
+
     # Version 2.30 introduced strict requirements on ELF relocations which cannot
     # be satisfied on aarch64 platform. Add backported fix from bugzilla.
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22764
     ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
-  ];
+  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
 
   outputs = [ "out" "info" "man" ];