From bba8516610e476864881d457e4299b0a0bf65803 Mon Sep 17 00:00:00 2001
From: Nicolas Berthier <nicolas.berthier@ocamlpro.com>
Date: Thu, 12 Dec 2024 18:41:38 +0100
Subject: [PATCH] Always honor `BUILD_STATIC_EXECS`

This fixes binaries included in VSIXs for Darwin platforms.
---
 .drom             | 2 +-
 CHANGELOG.md      | 1 +
 Makefile          | 3 +++
 Makefile.drom-tpl | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.drom b/.drom
index b6b926b3a..d5bb24fa8 100644
--- a/.drom
+++ b/.drom
@@ -25,7 +25,7 @@ d369e2949d85dee79233d322ce6f7587:.
 
 # begin context for Makefile
 # file Makefile
-28e611f8892d700df75a7d222996d657:Makefile
+47a1f06175119e41d07c168651c1a645:Makefile
 # end context for Makefile
 
 # begin context for README.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f95e99f..0c0097fb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [_] Next release
 
 ### Fixed
+- Binaries included in VSIXs for Darwin [#383](https://github.com/OCamlPro/superbol-studio-oss/pull/383)
 - Name of debugger, to avoid conflicts with the official "gdb" [#381](https://github.com/OCamlPro/superbol-studio-oss/pull/381)
 
 
diff --git a/Makefile b/Makefile
index 55cc95c55..ed2894e68 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,9 @@ DUNE = opam exec -- dune
 DUNE_ARGS ?= --root=$$(pwd)
 DUNE_CROSS_ARGS = $(strip $(if $(filter  win32,${TARGET_PLAT}),-x windows)	\
 			  $(if $(filter darwin,${TARGET_PLAT}),-x osx))
+ifeq ($(BUILD_STATIC_EXECS),true)
+  export LINKING_MODE=static
+endif
 
 VERSION = 0.1.5
 DEV_DEPS := merlin ocamlformat odoc
diff --git a/Makefile.drom-tpl b/Makefile.drom-tpl
index d128ecb7d..a0a34fe68 100644
--- a/Makefile.drom-tpl
+++ b/Makefile.drom-tpl
@@ -8,6 +8,9 @@ DUNE = opam exec -- dune
 DUNE_ARGS ?= --root=$$(pwd)
 DUNE_CROSS_ARGS = $(strip $(if $(filter  win32,${TARGET_PLAT}),-x windows)	\
 			  $(if $(filter darwin,${TARGET_PLAT}),-x osx))
+ifeq ($(BUILD_STATIC_EXECS),true)
+  export LINKING_MODE=static
+endif
 
 VERSION = !{version}
 DEV_DEPS := merlin ocamlformat odoc![if:gen:test] ppx_expect ppx_inline_test![fi]