Skip to content

Fix Stdlib.Domain upstream build dependencies #1987

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 4 commits into from
Nov 3, 2023
Merged

Fix Stdlib.Domain upstream build dependencies #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bae8857
domain dependencies
TheNumbat Nov 3, 2023
c275e1b
unbootstrap
TheNumbat Nov 3, 2023
77656a1
Merge branch 'main' into domain.depend
TheNumbat Nov 3, 2023
5c59d78
fix build
TheNumbat Nov 3, 2023
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: 0 additions & 2 deletions ocaml/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@ parsing/parse.cmi : \
parsing/parsetree.cmi \
parsing/longident.cmi
parsing/parser.cmo : \
utils/warnings.cmi \
parsing/syntaxerr.cmi \
parsing/parsetree.cmi \
parsing/longident.cmi \
Expand All @@ -592,7 +591,6 @@ parsing/parser.cmo : \
parsing/ast_helper.cmi \
parsing/parser.cmi
parsing/parser.cmx : \
utils/warnings.cmx \
parsing/syntaxerr.cmx \
parsing/parsetree.cmi \
parsing/longident.cmx \
Expand Down
6 changes: 6 additions & 0 deletions ocaml/otherlibs/dynlink/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ byte/dynlink.cmo : \
byte/dynlink_compilerlibs.cmi \
dynlink_common.cmi \
byte/dynlink.cmi
dynlink.cmo : \
dynlink_types.cmi \
dynlink.cmi
dynlink.cmi :
dynlink_common.cmo : \
dynlink_types.cmi \
Expand All @@ -19,6 +22,9 @@ dynlink_platform_intf.cmi : \
dynlink_types.cmo : \
dynlink_types.cmi
dynlink_types.cmi :
dynlink.cmx : \
dynlink_types.cmx \
dynlink.cmi
dynlink_common.cmx : \
dynlink_types.cmx \
dynlink_platform_intf.cmx \
Expand Down
16 changes: 11 additions & 5 deletions ocaml/stdlib/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,17 @@ stdlib__Digest.cmx : digest.ml \
stdlib__Digest.cmi
stdlib__Digest.cmi : digest.mli \
stdlib.cmi
domain.cmo : \
domain.cmi
domain.cmx : \
domain.cmi
domain.cmi :
stdlib__Domain.cmo : domain.ml \
stdlib__Sys.cmi \
stdlib__Obj.cmi \
stdlib__Array.cmi \
stdlib__Domain.cmi
stdlib__Domain.cmx : domain.ml \
stdlib__Sys.cmx \
stdlib__Obj.cmx \
stdlib__Array.cmx \
stdlib__Domain.cmi
stdlib__Domain.cmi : domain.mli
effect.cmo : \
effect.cmi
effect.cmx : \
Expand Down
1 change: 1 addition & 0 deletions ocaml/stdlib/StdlibModules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ STDLIB_MODULE_BASENAMES = \
fun \
gc \
digest \
domain \
bigarray \
random \
hashtbl \
Expand Down
5 changes: 5 additions & 0 deletions ocaml/stdlib/domain.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# 1 "domain.ml"
(**************************************************************************)
(* *)
(* OCaml *)
Expand All @@ -16,6 +17,10 @@
(* *)
(**************************************************************************)

open! Stdlib

[@@@ocaml.flambda_o3]

(* CR ocaml 5 runtime: domain-local-storage assumes single-domain,
i.e. calling split will never be necessary. *)

Expand Down
1 change: 1 addition & 0 deletions ocaml/stdlib/domain.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# 1 "domain.mli"
(**************************************************************************)
(* *)
(* OCaml *)
Expand Down
1 change: 1 addition & 0 deletions ocaml/toplevel/byte/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
stdlib__Char
stdlib__Complex
stdlib__Digest
stdlib__Domain
stdlib__Either
stdlib__Ephemeron
stdlib__Filename
Expand Down