From 8855e5cbdddee60c26da516b85298f5b43ef13d4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 26 Apr 2025 19:52:34 +0200 Subject: [PATCH 1/2] ocaml: use bytecode compiler on loongarch64-linux --- pkgs/development/compilers/ocaml/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index b0398fdc39cb..7a85f303fd06 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -49,7 +49,7 @@ let in let - useNativeCompilers = !stdenv.hostPlatform.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips && !stdenv.hostPlatform.isLoongArch64; inherit (lib) optional optionals From 11fcf324796b9b78f5e2636f7e3ef3e007e35a38 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 26 Apr 2025 19:59:34 +0200 Subject: [PATCH 2/2] ocamlPackages.findlib: fix build with bytecode mode --- pkgs/development/tools/ocaml/findlib/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index b0d8326fc98d..4d8f48f6f1c7 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -39,10 +39,13 @@ stdenv.mkDerivation rec { "${placeholder "out"}/etc/findlib.conf" ]; - buildFlags = [ - "all" - "opt" - ]; + buildFlags = + [ + "all" + ] + ++ lib.optionals ocaml.nativeCompilers [ + "opt" + ]; setupHook = writeText "setupHook.sh" '' addOCamlPath () {