From 7709297fd61979ea2d6fcac06b81ef670b5c6e59 Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 16 Dec 2022 19:46:52 +0000 Subject: [PATCH] no-flat-float-array does not support non-x86_64 or arm64 platforms with OCaml >= 5.0 --- ocaml_version.ml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ocaml_version.ml b/ocaml_version.ml index c19757a..ee97803 100644 --- a/ocaml_version.ml +++ b/ocaml_version.ml @@ -473,7 +473,7 @@ let trunk_variants (arch:arch) = if arch = `X86_64 || arch = `Aarch64 then [[]; [`Afl]; [`Flambda]; [`Disable_flat_float_array]] else - [[]; [`Disable_flat_float_array]] + [] in (* Frame pointers aren't currently supported on trunk *) let _arch_opts = @@ -507,7 +507,8 @@ let compiler_variants arch ({major; minor; _} as t) = variants in (* +no-flat-float-array for OCaml 4.12+ *) let variants = - if version >= (4, 12) then + if (version >= (5, 0) && (arch = `X86_64 || arch = `Aarch64)) + || (version >= (4, 12) && version < (5, 0)) then [`Disable_flat_float_array] :: variants else variants in