Fix recipes

ocaml · May 13, 2024 · e2612d3 · e2612d3
1 parent 6b4eaaf
commit e2612d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ DUNE_PROMOTE_ARG =
 DUNE_PROMOTE_ARG += --promote-install-files
 
 ifeq ($(DUNE),)
-  DUNE_EXE = src_ext/dune-local/dune.exe
+  DUNE_EXE = src_ext/dune-local/_boot/dune.exe
   ifeq ($(shell command -v cygpath 2>/dev/null),)
     DUNE := $(DUNE_EXE)
   else
@@ -44,7 +44,7 @@ else
   DUNE_PROFILE_ARG = --profile=$(DUNE_PROFILE)
 endif
 
-src_ext/dune-local/dune.exe: src_ext/dune-local.stamp $(DUNE_SECONDARY)
+src_ext/dune-local/_boot/dune.exe: src_ext/dune-local.stamp $(DUNE_SECONDARY)
 ifeq ($(DUNE_SECONDARY),)
 	cd src_ext/dune-local && ocaml boot/bootstrap.ml
 else

diff --git a/src_ext/Makefile b/src_ext/Makefile
@@ -95,7 +95,7 @@ reset-lib-pkg:
 	@rm -rf ../bootstrap/ocaml/lib/ocaml/site-lib ../bootstrap/ocaml/etc *.pkgbuild
 
 ifeq ($(DUNE),)
-DUNE_DEP=dune-local/_boot/install/default/bin/dune$(EXE)
+DUNE_DEP=dune-local/_boot/dune$(EXE)
 DUNE_CLONE=dune-local.stamp
 ifeq ($(shell command -v cygpath 2>/dev/null),)
 DUNE:=$(DUNE_DEP)
@@ -107,8 +107,8 @@ DUNE_DEP=
 DUNE_CLONE=
 endif
 
-dune-local/_boot/install/default/bin/dune$(EXE): $(DUNE_CLONE)
-	cd dune-local && ocaml boot/bootstrap.ml && ./boot.exe --release
+dune-local/_boot/dune$(EXE): $(DUNE_CLONE)
+	cd dune-local && ocaml boot/bootstrap.ml
 
 build-pkg: clone-pkg $(PKG_EXTS:=.pkgbuild)
 	@

diff --git a/src_ext/Makefile.packages b/src_ext/Makefile.packages
@@ -108,7 +108,7 @@ dose3-pkg-build:
 
 dune-local-pkg-build:
 	ocaml boot/bootstrap.ml
-	cp dune.exe $(OCAMLBIN)/dune$(EXT_EXE)
+	cp _boot/dune.exe $(OCAMLBIN)/dune$(EXT_EXE)
 
 mccs-pkg-build:
 	dune build @install -p mccs