From 16d91ee628d781c721506b19e3e03bed810327e8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 21:45:37 +0700 Subject: pkgs/os-specific: stdenv.lib -> lib --- pkgs/os-specific/darwin/binutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/darwin/binutils/default.nix') diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index fad33b21d04..e9aa706da2d 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils-unwrapped, cctools, llvm }: +{ lib, stdenv, binutils-unwrapped, cctools, llvm }: # Make sure both underlying packages claim to have prepended their binaries # with the same targetPrefix. @@ -32,7 +32,7 @@ stdenv.mkDerivation { # - strip: the binutils one seems to break mach-o files # - lipo: gcc build assumes it exists # - nm: the gnu one doesn't understand many new load commands - for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do + for i in ${lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do ln -sf "${cctools}/bin/$i" "$out/bin/$i" done @@ -56,7 +56,7 @@ stdenv.mkDerivation { }; meta = { - maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + maintainers = with lib.maintainers; [ matthewbauer ]; priority = 10; }; } -- cgit 1.4.1 From a730703e6f48d0d3189dc21115d7f8b9495489e5 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Tue, 16 Mar 2021 21:27:34 -0700 Subject: darwin.binutils: use clang for as on aarch64-darwin (#115167) Without this change `as` on `aarch64-darwin` is defunct: ``` $ /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as -v /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as: assembler (/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as or /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as) for architecture arm64 not installed Installed assemblers are: /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc64/as for architecture ppc64 /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/x86_64/as for architecture x86_64 /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc/as for architecture ppc /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/i386/as for architecture i386 /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm/as for architecture arm ``` Apple defaults to Clang in all cases from what I see, but nixpkgs prefers `cctools`: #51881. --- pkgs/os-specific/darwin/binutils/default.nix | 13 ++++++++++++- pkgs/top-level/darwin-packages.nix | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/darwin/binutils/default.nix') diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index e9aa706da2d..29ae1871ddb 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, binutils-unwrapped, cctools, llvm }: +{ lib, stdenv, makeWrapper, binutils-unwrapped, cctools, llvm, clang-unwrapped }: # Make sure both underlying packages claim to have prepended their binaries # with the same targetPrefix. @@ -49,8 +49,19 @@ stdenv.mkDerivation { ln -sv "$path" "$dest_path" done done + '' + # On aarch64-darwin we must use clang, because "as" from cctools just doesn't + # handle the arch. Proxying calls to clang produces quite a bit of warnings, + # 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" \ + --add-flags "-x assembler -integrated-as -c" ''; + nativeBuildInputs = lib.optionals stdenv.isAarch64 [ makeWrapper ]; + passthru = { inherit targetPrefix; }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 2197f128388..3ece95c5845 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -23,7 +23,7 @@ in binutils-unwrapped = callPackage ../os-specific/darwin/binutils { inherit (darwin) cctools; inherit (pkgs) binutils-unwrapped; - inherit (pkgs.llvmPackages_7) llvm; + inherit (pkgs.llvmPackages_7) llvm clang-unwrapped; }; binutils = pkgs.wrapBintoolsWith { -- cgit 1.4.1 From 0ba7a04743f40dd1fe44d1fa10e984c5929a513b Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 19 Nov 2020 16:56:03 +0900 Subject: darwin/binutils: include codesign_allocate --- pkgs/os-specific/darwin/binutils/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/darwin/binutils/default.nix') diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 29ae1871ddb..5dc57f43e4a 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -9,6 +9,7 @@ let cmds = [ "ar" "ranlib" "as" "install_name_tool" "ld" "strip" "otool" "lipo" "nm" "strings" "size" + "codesign_allocate" ]; in -- cgit 1.4.1