From ad1eb36dac9479afa80afb87338cb8e7c184ef35 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 25 Aug 2015 18:52:41 +0300 Subject: [PATCH] binutils: Don't use multiple-outputs when cross compiling --- pkgs/development/tools/misc/binutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index ccdb52238de7..ceec956004f5 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ./pt-pax-flags-20121023.patch ]; - outputs = [ "dev" "out" "info" ]; + outputs = (optional (cross == null) "dev") ++ [ "out" "info" ]; nativeBuildInputs = optional gold bison; buildInputs = [ zlib ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postFixup = "ln -s $out/bin $dev/bin"; # tools needed for development + postFixup = optionalString (cross == null) "ln -s $out/bin $dev/bin"; # tools needed for development meta = { description = "Tools for manipulating binaries (linker, assembler, etc.)";