From 4b99e18dca90a6f8dff11358784b41a29a804f37 Mon Sep 17 00:00:00 2001
From: Puneeth Chaganti <punchagan@muse-amuse.in>
Date: Wed, 5 Jun 2024 13:39:49 +0530
Subject: [PATCH] Pin dune to work around compiler options split

ocaml/ocaml@51e5cf226b39986abf03cbaad47cf49a1c35bc69 split the compiler
flags for native and bytecode compiler to separate flags. It also
changes the flag names which breaks builds of several packages. This
commit is a workaround for that change.
---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 79798fea4..a245fd777 100644
--- a/Makefile
+++ b/Makefile
@@ -108,9 +108,15 @@ ifeq (1, $(USE_SYS_DUNE_HACK))
 	ln -s $(SYS_DUNE_BASE_DIR)/lib/dune $(CURDIR)/_opam/sys_dune/lib/dune
 	opam repo add upstream "git+https://github.com/ocaml/opam-repository.git" --on-switch=$(CONFIG_SWITCH_NAME) --rank 2
 	opam install --switch=$(CONFIG_SWITCH_NAME) --yes ocamlfind
-	opam install --switch=$(CONFIG_SWITCH_NAME) --yes "dune.$(SANDMARK_DUNE_VERSION)" "dune-configurator.$(SANDMARK_DUNE_VERSION)"
-	# Pin the version so it doesn't change when installing packages
-	opam pin add --switch=$(CONFIG_SWITCH_NAME) --yes -n dune "$(SANDMARK_DUNE_VERSION)"
+	@{ case "$*" in \
+		5.3.*) \
+			echo "Pinning dune to fixed version to work around binary and native compiler options split"; \
+			opam pin add --yes -n --switch $* dune."$(SANDMARK_DUNE_VERSION)" https://github.com/punchagan/dune.git#fix-compiler-opts; \
+			opam install --switch=$(CONFIG_SWITCH_NAME) --yes "dune.$(SANDMARK_DUNE_VERSION)" "dune-configurator.$(SANDMARK_DUNE_VERSION)" ;; \
+		*) \
+			opam install --switch=$(CONFIG_SWITCH_NAME) --yes "dune.$(SANDMARK_DUNE_VERSION)" "dune-configurator.$(SANDMARK_DUNE_VERSION)" ; \
+			opam pin add --switch=$(CONFIG_SWITCH_NAME) --yes -n dune "$(SANDMARK_DUNE_VERSION)" ;; \
+	esac };
 endif
 
 ocamls=$(wildcard ocaml-versions/*.json)