Skip to content

Commit

Permalink
Upgrade the vendored dune to 3.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kit-ty-kate committed Mar 4, 2024
1 parent 321ca42 commit 7433c18
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ endif

src_ext/dune-local/dune.exe: src_ext/dune-local.stamp $(DUNE_SECONDARY)
ifeq ($(DUNE_SECONDARY),)
cd src_ext/dune-local && ocaml bootstrap.ml
cd src_ext/dune-local && ocaml boot/bootstrap.ml
else
cd src_ext/dune-local && ( unset OCAMLLIB ; unset CAML_LD_LIBRARY_PATH ; PATH="$(dir $(realpath $(DUNE_SECONDARY))):$$PATH" ../../$(DUNE_SECONDARY) bootstrap.ml )
cd src_ext/dune-local && ( unset OCAMLLIB ; unset CAML_LD_LIBRARY_PATH ; PATH="$(dir $(realpath $(DUNE_SECONDARY))):$$PATH" ../../$(DUNE_SECONDARY) boot/bootstrap.ml )
endif

src_ext/dune-local.stamp:
Expand Down
2 changes: 1 addition & 1 deletion src_ext/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ DUNE_CLONE=
endif

dune-local/_boot/install/default/bin/dune$(EXE): $(DUNE_CLONE)
cd dune-local && ocaml bootstrap.ml && ./boot.exe --release
cd dune-local && ocaml boot/bootstrap.ml && ./boot.exe --release

build-pkg: clone-pkg $(PKG_EXTS:=.pkgbuild)
@
Expand Down
4 changes: 2 additions & 2 deletions src_ext/Makefile.dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# NB If minimum OCaml version for Dune changes, update DUNE_SECONDARY in configure.ac
URL_dune-local = https://github.com/ocaml/dune/releases/download/3.5.0/dune-3.5.0.tbz
MD5_dune-local = 46d1bde258ef60f60f053e88fe9d937b
URL_dune-local = https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz
MD5_dune-local = bff778fff4996b890e5af3da7ecf5baa
2 changes: 1 addition & 1 deletion src_ext/Makefile.packages
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ dose3-pkg-build:
dune install "--prefix=$(OCAMLROOT)" -p dose3 dose3

dune-local-pkg-build:
ocaml bootstrap.ml
ocaml boot/bootstrap.ml
cp dune.exe $(OCAMLBIN)/dune$(EXT_EXE)

mccs-pkg-build: stublibs
Expand Down

0 comments on commit 7433c18

Please sign in to comment.