Skip to content

Commit

Permalink
Missed settings of RUNTIME_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
mshinwell committed Nov 8, 2023
1 parent ed531cd commit f6abb6b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ocaml/Makefile.common-jst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ boot-compiler: _build/_bootinstall
RUNTIME_DIR=$(RUNTIME_DIR) $(dune) build $(ws_boot) $(coverage_dune_flags) $(boot_targets)

boot-runtest: boot-compiler
$(dune) runtest $(ws_boot) $(coverage_dune_flags) --force
RUNTIME_DIR=$(RUNTIME_DIR) $(dune) runtest $(ws_boot) $(coverage_dune_flags) --force

runtime-stdlib: boot-compiler
RUNTIME_DIR=$(RUNTIME_DIR) $(dune) build $(ws_runstd) --only-package=ocaml_runtime_stdlib @install
Expand All @@ -79,7 +79,7 @@ compiler: runtime-stdlib
$(ocamldir)/tools/dumpobj.bc

runtest: compiler
$(dune) runtest $(ws_main)
RUNTIME_DIR=$(RUNTIME_DIR) $(dune) runtest $(ws_main)


# This Makefile supports old versions that don't have $(file), so we're using
Expand Down Expand Up @@ -376,7 +376,7 @@ hacking: _build/_bootinstall

.PHONY: hacking-emacs-poller
hacking-emacs-poller: _build/_bootinstall
$(dune) build $(ws_boot) --passive-watch-mode
RUNTIME_DIR=$(RUNTIME_DIR) $(dune) build $(ws_boot) --passive-watch-mode

.PHONY: hacking-emacs-builder
hacking-emacs-builder: _build/_bootinstall
Expand All @@ -385,7 +385,7 @@ hacking-emacs-builder: _build/_bootinstall

.PHONY: debug-printers
debug-printers: runtime-stdlib # required for $(ws_main) to work
$(dune) build $(ws_main) $(ocamldir)/tools/debug_printers
RUNTIME_DIR=$(RUNTIME_DIR) $(dune) build $(ws_main) $(ocamldir)/tools/debug_printers
@echo
@echo To load into ocamldebug, use:
@echo source \"$$(realpath _build/main/$(ocamldir)/tools/debug_printers)\"

0 comments on commit f6abb6b

Please sign in to comment.