From fcc769fe987c2d40a434f2b8ef832b2d06c2219b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Tue, 21 Nov 2023 15:01:09 +0100 Subject: [PATCH] Add `-cmi-file` to the ignored flags. Fixes #1703 --- src/kernel/mconfig.ml | 2 +- tests/test-dirs/with-cmi.t | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/kernel/mconfig.ml b/src/kernel/mconfig.ml index 6dc045063d..4db1c629e6 100644 --- a/src/kernel/mconfig.ml +++ b/src/kernel/mconfig.ml @@ -427,7 +427,7 @@ let ocaml_ignored_parametrized_flags = [ "-inline"; "-inline-prim-cost"; "-inline-toplevel"; "-intf"; "-intf_suffix"; "-intf-suffix"; "-o"; "-rounds"; "-runtime-variant"; "-unbox-closures-factor"; "-use-prims"; "-use_runtime"; "-use-runtime"; - "-error-style"; "-dump-dir"; + "-error-style"; "-dump-dir"; "-cmi-file"; ] let ocaml_warnings_spec ~error = diff --git a/tests/test-dirs/with-cmi.t b/tests/test-dirs/with-cmi.t index 05b5a26c7e..bb0e9daa10 100644 --- a/tests/test-dirs/with-cmi.t +++ b/tests/test-dirs/with-cmi.t @@ -21,14 +21,7 @@ Since OCaml 5.1 the compiler support the -cmi-file flag: $ $OCAMLC -c -cmi-file main.cmi main.ml -FIXME: Merlin should ignore the -cmi-file flag +Merlin should ignore the -cmi-file flag $ $MERLIN single errors -cmi-file main.cmi -filename main.ml jq '.value' - [ - { - "type": "config", - "sub": [], - "valid": true, - "message": "unknown flag -cmi-file" - } - ] + []