use -custom and disable opam-depext

aryx · Apr 19, 2024 · 320de22 · 320de22
1 parent eb4a150
commit 320de22
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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`