From f8b18c100b9fea36b0289770476baecc2c009c49 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sun, 23 Oct 2022 04:16:47 +0200 Subject: ocamlPackages.ocaml: Migrate to integrated assembler for Darwin This is linked to https://github.com/ocaml/ocaml/pull/10176 A similar issue appeared with clang in cctools (Darwin): ``` as: this system assembler is deprecated. Please migrate to the clang integrated assembler (`as -q'). ``` https://developer.apple.com/documentation/xcode-release-notes/xcode-12-release-notes#Deprecations --- pkgs/development/compilers/ocaml/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 7db0eca0ee4d..f19344905339 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (lib.versionOlder version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin && lib.versionOlder version "4.13") '' + '' + optionalString (stdenv.isDarwin) '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" -- cgit 1.4.1