diff options
| author | Et7f3 <cadeaudeelie@gmail.com> | 2022-10-23 04:16:47 +0200 |
|---|---|---|
| committer | Et7f3 <cadeaudeelie@gmail.com> | 2022-10-23 14:44:18 +0200 |
| commit | f8b18c100b9fea36b0289770476baecc2c009c49 (patch) | |
| tree | ddc3e09cb4a314543aafb067131eff86524bdcbe /pkgs/development/compilers/ocaml | |
| parent | 84fc8bf89e5404ff981084870683bf91de490bbe (diff) | |
| download | nixlib-f8b18c100b9fea36b0289770476baecc2c009c49.tar nixlib-f8b18c100b9fea36b0289770476baecc2c009c49.tar.gz nixlib-f8b18c100b9fea36b0289770476baecc2c009c49.tar.bz2 nixlib-f8b18c100b9fea36b0289770476baecc2c009c49.tar.lz nixlib-f8b18c100b9fea36b0289770476baecc2c009c49.tar.xz nixlib-f8b18c100b9fea36b0289770476baecc2c009c49.tar.zst nixlib-f8b18c100b9fea36b0289770476baecc2c009c49.zip | |
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
Diffstat (limited to 'pkgs/development/compilers/ocaml')
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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" |