From 117ba9107afbe992c15ec9116427ba1d91f6dc58 Mon Sep 17 00:00:00 2001 From: Kate Date: Tue, 9 Jul 2024 21:05:54 +0100 Subject: [PATCH] Unset OPAM_SWITCH_PREFIX when using make cold --- Makefile | 4 ++-- master_changes.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9ba7c088aa3..8696e9e833f 100644 --- a/Makefile +++ b/Makefile @@ -273,8 +273,8 @@ src_ext/secondary/ocaml/bin/ocaml: env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_TARGETS="world opt" BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT) cold: compiler - env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= ./configure --with-vendored-deps --without-dune --enable-cold-check $(CONFIGURE_ARGS) - env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= $(MAKE) + env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= OPAM_SWITCH_PREFIX= ./configure --with-vendored-deps --without-dune --enable-cold-check $(CONFIGURE_ARGS) + env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= OPAM_SWITCH_PREFIX= $(MAKE) cold-%: env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= $(MAKE) $* diff --git a/master_changes.md b/master_changes.md index 0efd3eeb5cc..731277db606 100644 --- a/master_changes.md +++ b/master_changes.md @@ -75,6 +75,7 @@ users) ## Build * Synchronise opam-core.opam with opam-repository changes [#6043 @dra27] + * Unset OPAM_SWITCH_PREFIX when using make cold [#5534 @kit-ty-kate] ## Infrastructure