From afb4173e71f6069f7a49baf44b16569bf0cbcce4 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 12 Apr 2020 14:45:16 +0200
Subject: Fixing export of CAML_LD_LIBRARY_PATH from config/Makefile to
 Makefile.common.

There were single quotes which were not interpreted in "PATH" syntax.
---
 Makefile.build | 4 ----
 configure.ml   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile.build b/Makefile.build
index 5b26f11b12..e5cff50c86 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -269,10 +269,6 @@ OPT:=
 BESTOBJ:=.cmo
 BESTLIB:=.cma
 BESTDYN:=.cma
-
-# needed while booting if non -local
-CAML_LD_LIBRARY_PATH := $(PWD)/kernel/byterun:$(CAML_LD_LIBRARY_PATH)
-export CAML_LD_LIBRARY_PATH
 endif
 
 define bestobj
diff --git a/configure.ml b/configure.ml
index eaa0e321b0..282b40db27 100644
--- a/configure.ml
+++ b/configure.ml
@@ -983,7 +983,7 @@ let config_runtime () =
     ["-dllib";"-lcoqrun";"-dllpath";("\"" ^ coqtop ^ "/kernel/byterun\"")]
   | _ ->
     let ld="CAML_LD_LIBRARY_PATH" in
-    build_loadpath := sprintf "export %s:='%s/kernel/byterun':$(%s)" ld coqtop ld;
+    build_loadpath := sprintf "export %s:=%s/kernel/byterun:$(%s)" ld coqtop ld;
     ["-dllib";"-lcoqrun";"-dllpath";coqlib/"kernel/byterun"]
 
 let vmbyteflags = config_runtime ()
-- 
cgit v1.2.3


From 0d207dc4dc7d593c422ed81c07a7e1532899e4ec Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 12 Apr 2020 14:46:41 +0200
Subject: Exporting BEST as OPT for the tests using coq_makefile-generated
 Makefile.

---
 test-suite/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test-suite/Makefile b/test-suite/Makefile
index eade52b6eb..171b197891 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -62,6 +62,10 @@ coqtopbyte := $(BIN)coqtop.byte -q
 coqc_interactive := $(coqc) -test-mode -async-proofs-cache force
 coqdep := $(BIN)coqdep
 
+# This is the convention for coq_makefile
+OPT=-$(BEST)
+export OPT
+
 VERBOSE?=
 SHOW := $(if $(VERBOSE),@true,@echo)
 HIDE := $(if $(VERBOSE),,@)
-- 
cgit v1.2.3