Skip to content

Commit

Permalink
Remove uchar and seq dummy modules (they all have their own opam pack…
Browse files Browse the repository at this point in the history
…age and were never defined in neither the compiler on ocamlfind)

Signed-off-by: Kate <[email protected]>
  • Loading branch information
kit-ty-kate committed Dec 8, 2021
1 parent 099652a commit 47c1d2d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
14 changes: 0 additions & 14 deletions src/dune_rules/findlib/meta.ml
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,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 =
Expand Down Expand Up @@ -292,18 +290,6 @@ let builtins ~stdlib_dir ~version:ocaml_version =
; ocamldoc
]
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
Expand Down
4 changes: 0 additions & 4 deletions src/dune_rules/ocaml_version.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions src/dune_rules/ocaml_version.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 47c1d2d

Please sign in to comment.