Skip to content

Commit

Permalink
Always honor BUILD_STATIC_EXECS
Browse files Browse the repository at this point in the history
This fixes binaries included in VSIXs for Darwin platforms.
  • Loading branch information
nberth committed Dec 16, 2024
1 parent 857dc31 commit bba8516
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .drom

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
3 changes: 3 additions & 0 deletions Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Makefile.drom-tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit bba8516

Please sign in to comment.