From 00037f740333a18292326e9fd5c0163c91fe41de Mon Sep 17 00:00:00 2001 From: Jasper <39903+jbg@users.noreply.github.com> Date: Tue, 17 Aug 2021 09:12:51 +0700 Subject: darwin.binutils: fix wrapper of `as` when cross-compiling to aarch64-darwin (#134097) --- pkgs/os-specific/darwin/binutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 5dc57f43e4a..c5bc50cafd7 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation { # and using clang directly here is a better option than relying on cctools. # On x86_64-darwin the Clang version is too old to support this mode. + lib.optionalString stdenv.isAarch64 '' - rm $out/bin/as - makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/as" \ + rm $out/bin/${targetPrefix}as + makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ --add-flags "-x assembler -integrated-as -c" ''; -- cgit 1.4.1