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.

Sign up for GitHub

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

Add META rule for 'compiler-libs.native-toplevel' (ocamltoplevel.cmxa) #4175

Merged
merged 1 commit into from
Feb 14, 2021
+32 −13
Merged

Add META rule for 'compiler-libs.native-toplevel' (ocamltoplevel.cmxa) #4175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Unreleased
that `(using coq 0.3)` does require Coq 8.10 at least (#4224, fixes
#4142, @ejgallego)

- Add a META rule for 'compiler-libs.native-toplevel' (#4175, @altgr)

2.8.2 (21/01/2021)
------------------

Expand Down
43 changes: 30 additions & 13 deletions src/dune_rules/findlib/meta.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,19 @@ let archive p s = rule "archive" [ Pos p ] Set s

let plugin p s = rule "plugin" [ Pos p ] Set s

let archives name =
[ archive "byte" (name ^ Mode.compiled_lib_ext Byte)
; archive "native" (name ^ Mode.compiled_lib_ext Native)
; plugin "byte" (name ^ Mode.compiled_lib_ext Byte)
; plugin "native" (name ^ Mode.plugin_ext Native)
]
let exists_if s = rule "exists_if" [] Set s

let archives ?(kind = [ Mode.Byte; Mode.Native ]) name =
List.filter_map
[ (Mode.Byte, archive, Mode.compiled_lib_ext)
; (Mode.Native, archive, Mode.compiled_lib_ext)
; (Mode.Byte, plugin, Mode.compiled_lib_ext)
; (Mode.Native, plugin, Mode.plugin_ext)
] ~f:(fun (k, f, ext) ->
if List.mem k ~set:kind then
Some (f (Mode.to_string k) (name ^ ext k))
else
None)

(* fake entry we use to pass down the list of toplevel modules for root_module *)
let main_modules names =
Expand All @@ -148,7 +155,8 @@ let main_modules names =

let builtins ~stdlib_dir ~version:ocaml_version =
let version = version "[distributed with Ocaml]" in
let simple name ?(labels = false) ?dir ?archive_name deps =
let simple name ?(labels = false) ?dir ?archive_name ?kind ?exists_if_ext deps
=
let archive_name =
match archive_name with
| None -> name
Expand All @@ -161,15 +169,19 @@ let builtins ~stdlib_dir ~version:ocaml_version =
main_modules [ name ]
in
let name = Lib_name.of_string name in
let archives = archives archive_name in
let archives = archives archive_name ?kind in
let main_modules = main_modules in
{ name = Some name
; entries =
requires deps :: version :: main_modules
::
( match dir with
| None -> archives
| Some d -> directory d :: archives )
| None -> []
| Some d -> [ directory d ] )
@ ( match exists_if_ext with
| None -> []
| Some ext -> [ exists_if (archive_name ^ ext) ] )
@ archives
}
in
let dummy name =
Expand All @@ -178,8 +190,9 @@ let builtins ~stdlib_dir ~version:ocaml_version =
}
in
let compiler_libs =
let sub name deps =
Package (simple name deps ~archive_name:("ocaml" ^ name))
let sub name ?kind ?exists_if_ext deps =
Package
(simple name deps ~archive_name:("ocaml" ^ name) ?kind ?exists_if_ext)
in
{ name = Some (Lib_name.of_string "compiler-libs")
; entries =
Expand All @@ -189,7 +202,11 @@ let builtins ~stdlib_dir ~version:ocaml_version =
; sub "common" []
; sub "bytecomp" [ "compiler-libs.common" ]
; sub "optcomp" [ "compiler-libs.common" ]
; sub "toplevel" [ "compiler-libs.bytecomp" ]
; sub "toplevel" [ "compiler-libs.bytecomp" ] ~kind:[ Byte ]
; sub "toplevel"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be native-toplevel (cf #4248) ?

[ "compiler-libs.optcomp"; "dynlink" ]
~kind:[ Native ]
~exists_if_ext:(Mode.compiled_lib_ext Native)
]
}
in
Expand Down