Merge remote-tracking branch 'refs/remotes/origin/master'

aryx · Apr 27, 2024 · 5ce0ae8 · 5ce0ae8
2 parents ac874f8 + 3a7e12d
commit 5ce0ae8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/bin/ocamlcflags b/bin/ocamlcflags
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+OCAML_VERSION_MAJOR=`ocamlc -version | cut -f1 -d.`
+#OCAML_VERSION_MINOR = `ocamlopt -version | cut -f2 -d.`
+#OCAML_VERSION_POINT = `ocamlopt -version | cut -f3 -d.`
+
+case "$OCAML_VERSION_MAJOR" in
+    "3") ;;
+    "4")
+       echo "-absname -bin-annot";;
+    "5")
+       echo "-absname -bin-annot";;
+    "*") ;;
+esac
diff --git a/mkconfig b/mkconfig
@@ -4,12 +4,12 @@ OPT=.opt
 
 # Limit to just stdcompat! This is Xix!
 EXTERNAL_LIB=`ocamlfind query stdcompat`
+EXTRA_FLAGS=`ocamlcflags`
 
 # -g so we can get good backtrace
-#TODO: -bin-annot -absname
 #WARNING_FLAGS?=-w +A-4-29-6-45-41-44-48 -warn-error +a 
 #OCAMLCFLAGS=-thread $(WARNING_FLAGS) $(OCAMLCFLAGS_EXTRA)
-COMPFLAGS=-I $EXTERNAL_LIB -g
+COMPFLAGS=-I $EXTERNAL_LIB -g $EXTRA_FLAGS
 
 # We need -g for good backtrace.
 # We need -custom because of dllstdcompat__stubs, otherwise