From 320de223a6aba390a14272867491227261c20d45 Mon Sep 17 00:00:00 2001
From: pad <pad@r2c.dev>
Date: Fri, 19 Apr 2024 19:37:14 +0200
Subject: [PATCH] use -custom and disable opam-depext

---
 .github/workflows/build-and-test.jsonnet | 2 ++
 .github/workflows/build-and-test.yml     | 1 +
 bootstrap-mk.sh                          | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.jsonnet b/.github/workflows/build-and-test.jsonnet
index db283ed..2b123ca 100644
--- a/.github/workflows/build-and-test.jsonnet
+++ b/.github/workflows/build-and-test.jsonnet
@@ -40,6 +40,8 @@ local job = {
       uses: "ocaml/setup-ocaml@v2",
       with: {
 	'ocaml-compiler': '${{ matrix.ocaml-compiler }}',
+	// available only for OCaml >= 4.0.0 and we want also 3.10.0
+	'opam-depext': false,
       }
     },
     {
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a44d9c8..5c76c37 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -7,6 +7,7 @@ jobs:
       - uses: ocaml/setup-ocaml@v2
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          opam-depext: false
       - name: Install dependencies
         run: |
           opam install --deps-only .
diff --git a/bootstrap-mk.sh b/bootstrap-mk.sh
index fe4f9a5..ccd636c 100755
--- a/bootstrap-mk.sh
+++ b/bootstrap-mk.sh
@@ -27,8 +27,12 @@ EXTERNAL_LIB=`ocamlfind query stdcompat`
 #TODO? -bin-annot -absname -dtypes -g
 OCAMLCFLAGS="-I $EXTERNAL_LIB"
 
+# We need -custom below because of dllstdcompat__stubs, otherwise
+# we would need to set CAML_LD_LIBRARY_PATH before running the programs.
+# LATER: would be good to remove if one day we want to store
+# a BOOTSTRAP/mk and we want a really portable bytecode across platforms.
 #TODO? for windows under cygwin might need -custom
-EXTRALINKFLAGS="-I $EXTERNAL_LIB stdcompat.cma"
+EXTRALINKFLAGS="-I $EXTERNAL_LIB stdcompat.cma -custom"
 
 TOP=`pwd`