From 99f21da808f68f4347e73b3015eed47c82cbe938 Mon Sep 17 00:00:00 2001
From: pad <yoann.padioleau@gmail.com>
Date: Sat, 27 Apr 2024 19:40:10 +0200
Subject: [PATCH 1/2] Add -absname via dynamic bin/ocamlcflags

---
 bin/ocamlcflags | 2 ++
 mkconfig        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100755 bin/ocamlcflags

diff --git a/bin/ocamlcflags b/bin/ocamlcflags
new file mode 100755
index 00000000..03867703
--- /dev/null
+++ b/bin/ocamlcflags
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "-absname -bin-annot"
diff --git a/mkconfig b/mkconfig
index 09b2a243..41bd7a9c 100644
--- 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

From bb549a0613808e9c62d54ab054b9b2f093912ca1 Mon Sep 17 00:00:00 2001
From: pad <pad@r2c.dev>
Date: Sat, 27 Apr 2024 20:16:28 +0200
Subject: [PATCH 2/2] fix for 3.10

---
 bin/ocamlcflags | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/ocamlcflags b/bin/ocamlcflags
index 03867703..224725d3 100755
--- a/bin/ocamlcflags
+++ b/bin/ocamlcflags
@@ -1,2 +1,14 @@
 #!/bin/sh
-echo "-absname -bin-annot"
+
+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