Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove uchar and seq dummy modules #5260

Merged
merged 1 commit into from
Feb 10, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Unreleased
----------

- Remove `uchar` and `seq` dummy ocamlfind libraries from dune's builtin
library database (#5260, @kit-ty-kate)

- Add a `DUNE_DIFF_COMMAND` environment variable to match `--diff-command`
command-line parameter (@raphael-proust, fix #5369, #5375)

10 changes: 0 additions & 10 deletions src/dune_rules/findlib/meta.ml
Original file line number Diff line number Diff line change
@@ -232,8 +232,6 @@ let builtins ~stdlib_dir ~version:ocaml_version =
in
let dynlink = simple "dynlink" [] ~dir:"+" in
let bytes = dummy "bytes" in
let uchar = dummy "uchar" in
let seq = dummy "seq" in
let threads =
{ name = Some (Lib_name.of_string "threads")
; entries =
@@ -280,14 +278,6 @@ let builtins ~stdlib_dir ~version:ocaml_version =
if Ocaml_version.has_bigarray_library ocaml_version then bigarray :: base
else base
in
let base =
if Ocaml_version.stdlib_includes_uchar ocaml_version then uchar :: base
else base
in
let base =
if Ocaml_version.stdlib_includes_seq ocaml_version then seq :: base
else base
in
let base =
if Path.exists (Path.relative stdlib_dir "graphics.cma") then
graphics :: base
4 changes: 0 additions & 4 deletions src/dune_rules/ocaml_version.ml
Original file line number Diff line number Diff line change
@@ -20,12 +20,8 @@ let supports_response_file version = version >= (4, 05, 0)

let ocamlmklib_supports_response_file version = version >= (4, 08, 0)

let stdlib_includes_uchar version = version >= (4, 03, 0)

let stdlib_includes_bigarray version = version >= (4, 07, 0)

let stdlib_includes_seq version = version >= (4, 07, 0)

let ooi_supports_no_approx version = version >= (4, 05, 0)

let ooi_supports_no_code version = version >= (4, 05, 0)
6 changes: 0 additions & 6 deletions src/dune_rules/ocaml_version.mli
Original file line number Diff line number Diff line change
@@ -29,15 +29,9 @@ val supports_response_file : t -> bool
(** Does ocamlmklib support [-args0]? *)
val ocamlmklib_supports_response_file : t -> bool

(** Whether the standard library includes the [Uchar] module *)
val stdlib_includes_uchar : t -> bool

(** Whether the standard library includes the [Bigarray] module *)
val stdlib_includes_bigarray : t -> bool

(** Whether the standard library includes the [Seq] module *)
val stdlib_includes_seq : t -> bool

(** Whether ocamlobjinfo supports -no-approx*)
val ooi_supports_no_approx : t -> bool