diff --git a/.drom b/.drom index b6b926b3..d5bb24fa 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 667bee13..b7d705c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## [_] Next release +### Fixed +- Binaries included in VSIXs for Darwin [#383](https://github.com/OCamlPro/superbol-studio-oss/pull/383) + ## [0.1.4] Fifth α release (2024-10-25) diff --git a/Makefile b/Makefile index 55cc95c5..ed2894e6 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 d128ecb7..a0a34fe6 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]