diff options
| author | Jasper <39903+jbg@users.noreply.github.com> | 2021-08-17 09:12:51 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 22:12:51 -0400 |
| commit | 00037f740333a18292326e9fd5c0163c91fe41de (patch) | |
| tree | 032846dd9fec7e0f2c504ec84485f75c1a5a4d81 | |
| parent | 5919a4254607dd6a08c964aaaf0a180c6cd6214d (diff) | |
| download | nixpkgs-00037f740333a18292326e9fd5c0163c91fe41de.tar nixpkgs-00037f740333a18292326e9fd5c0163c91fe41de.tar.gz nixpkgs-00037f740333a18292326e9fd5c0163c91fe41de.tar.bz2 nixpkgs-00037f740333a18292326e9fd5c0163c91fe41de.tar.lz nixpkgs-00037f740333a18292326e9fd5c0163c91fe41de.tar.xz nixpkgs-00037f740333a18292326e9fd5c0163c91fe41de.tar.zst nixpkgs-00037f740333a18292326e9fd5c0163c91fe41de.zip | |
darwin.binutils: fix wrapper of `as` when cross-compiling to aarch64-darwin (#134097)
| -rw-r--r-- | pkgs/os-specific/darwin/binutils/default.nix | 4 |
1 files 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" ''; |