Skip to content

Commit

Permalink
Upgrade to OCaml 4.14.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonah Beckford committed Apr 14, 2024
1 parent 92228f1 commit cae7b75
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ endif
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

# [important packages]
# ocaml.4.14.0: So works with DkML 2.0.0 on Windows
# ocaml.4.14.2: So works with DkML 2.1.1 on Windows
# [packages that must be pinned as well to propagate into Opam Monorepo .locked files]
# [edit 1: now unnecessary since no Opam Monorepo .locked files]
# dune.3.8.3: So works with DkML 2.0.0 on Windows
VERSION_OCAML = 4.14.0
VERSION_OCAML = 4.14.2
VERSION_DUNE = 3.8.3

SWITCH_ARTIFACTS = _opam/.opam-switch/switch-config
Expand Down
3 changes: 2 additions & 1 deletion src/runtimelib/init_system.ml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ let create_ocaml_home_with_compiler ~system_cfg ~enable_imprecise_c99_float_ops
match system_cfg.ocaml_compiler_version with
| "4.12.1" -> Ok "46c947827ec2f6d6da7fe5e195ae5dda1d2ad0c5"
| "4.14.0" -> Ok "15553b77175270d987058b386d737ccb939e8d5a"
| "4.14.2" -> Ok "8eb41f72ded84df884c3671734c947f612091f84"
| _ ->
Rresult.R.error_msgf
"Only 4.12.1 and 4.14.0 are supported DkML versions, not %s"
"Only 4.12.1, 4.14.0 and 4.14.2 are supported DkML versions, not %s"
system_cfg.ocaml_compiler_version
in
let install_compiler_fp = Fpath.(system_cfg.scripts_dir_fp // rel_fp) in
Expand Down

0 comments on commit cae7b75

Please sign in to comment.