From 9568a7afef30d78eb422bf2a78c972d90c9f51b9 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 20 Apr 2022 00:03:01 +0900 Subject: [PATCH] binutils: fix cross compilation from darwin The libtool patch is required to correctly invoke the linker while building, so it should depend on the build toolchain. --- 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 b593e8767614..93b018b0d8b0 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation { texinfo ] ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] - ++ lib.optionals targetPlatform.isDarwin [ autoconf269 automake gettext libtool ] + ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] ++ lib.optionals targetPlatform.isVc4 [ flex ] ; @@ -118,7 +118,7 @@ stdenv.mkDerivation { inherit noSysDirs; - preConfigure = (lib.optionalString targetPlatform.isDarwin '' + preConfigure = (lib.optionalString buildPlatform.isDarwin '' for i in */configure.ac; do pushd "$(dirname "$i")" echo "Running autoreconf in $PWD"