From 666aa776c21e4b23c4a03173212065567dc38924 Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@outlook.com>
Date: Wed, 3 May 2023 13:21:35 +0100
Subject: [PATCH] Unset OPAM_SWITCH_PREFIX when using make cold

---
 Makefile           | 2 +-
 Makefile.config.in | 5 ++++-
 configure          | 9 +++++++++
 configure.ac       | 7 +++++++
 master_changes.md  | 1 +
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 922e0c58490..f1b984b20ff 100644
--- a/Makefile
+++ b/Makefile
@@ -280,7 +280,7 @@ src_ext/secondary/ocaml/bin/ocaml:
 
 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)
+	$(MAKE)
 
 cold-%:
 	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= $(MAKE) $*
diff --git a/Makefile.config.in b/Makefile.config.in
index 044c6a01d3b..5a0572e0c01 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -38,4 +38,7 @@ PATCH = @PATCH@
 
 VENDORED = @VENDORED@
 
-export OCAMLVERSION OCAMLFIND OCAML OCAMLC OCAMLOPT EXE PATH INCLUDE LIB CPATH LIBRARY_PATH OCAMLLIB
+CAML_LD_LIBRARY_PATH = @CAML_LD_LIBRARY_PATH@
+OPAM_SWITCH_PREFIX = @OPAM_SWITCH_PREFIX@
+
+export OCAMLVERSION OCAMLFIND OCAML OCAMLC OCAMLOPT EXE PATH INCLUDE LIB CPATH LIBRARY_PATH OCAMLLIB CAML_LD_LIBRARY_PATH OPAM_SWITCH_PREFIX
diff --git a/configure b/configure
index 2d6d3749699..f6c71f3859a 100755
--- a/configure
+++ b/configure
@@ -703,6 +703,8 @@ AWK
 LIBRARY_PATH
 CPATH
 LIB_PREFIX
+OPAM_SWITCH_PREFIX
+CAML_LD_LIBRARY_PATH
 EXE
 WIN32
 OCAML_OS_TYPE
@@ -2583,6 +2585,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+CAML_LD_LIBRARY_PATH="${CAML_LD_LIBRARY_PATH}"
+OPAM_SWITCH_PREFIX="${OPAM_SWITCH_PREFIX}"
+
 # If a bootstrap compiler has been built, always use it
 PATH_PREPEND=
 PRE_BOOTSTRAP_PATH="$PATH"
@@ -2591,6 +2596,8 @@ then :
 
   echo Bootstrap compiler found -- activating
   unset OCAMLLIB
+  unset CAML_LD_LIBRARY_PATH
+  unset OPAM_SWITCH_PREFIX
   export PATH_PREPEND=`pwd`/bootstrap/ocaml/bin:
   export PATH="$PATH_PREPEND$PATH"
 
@@ -3970,6 +3977,8 @@ fi
 
 
 
+
+
 # AC_PREFIX_DEFAULT must be at the top level, which is the reason for the
 # somewhat convoluted pair of sed expressions...
 
diff --git a/configure.ac b/configure.ac
index 59fce6e5c8f..bd50b559d34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,12 +4,17 @@ AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
 
+CAML_LD_LIBRARY_PATH="${CAML_LD_LIBRARY_PATH}"
+OPAM_SWITCH_PREFIX="${OPAM_SWITCH_PREFIX}"
+
 # If a bootstrap compiler has been built, always use it
 PATH_PREPEND=
 PRE_BOOTSTRAP_PATH="$PATH"
 AS_IF([ test -x bootstrap/ocaml/bin/ocamlc -o -x bootstrap/ocaml/bin/ocamlopt ],[
   echo Bootstrap compiler found -- activating
   unset OCAMLLIB
+  unset CAML_LD_LIBRARY_PATH
+  unset OPAM_SWITCH_PREFIX
   export PATH_PREPEND=`pwd`/bootstrap/ocaml/bin:
   export PATH="$PATH_PREPEND$PATH"
 ])
@@ -39,6 +44,8 @@ AS_IF([ test "${OCAML_OS_TYPE}" = "Win32"],[
 
 AC_SUBST(WIN32)
 AC_SUBST(EXE)
+AC_SUBST(CAML_LD_LIBRARY_PATH)
+AC_SUBST(OPAM_SWITCH_PREFIX)
 
 # AC_PREFIX_DEFAULT must be at the top level, which is the reason for the
 # somewhat convoluted pair of sed expressions...
diff --git a/master_changes.md b/master_changes.md
index aff2a417b2d..83b75184983 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -68,6 +68,7 @@ users)
 ## VCS
 
 ## Build
+  * Unset OPAM_SWITCH_PREFIX when using make cold [#5534 @kit-ty-kate]
 
 ## Infrastructure