From 89e1ad4e4224b382173e088ba243d7a1987a4e1b Mon Sep 17 00:00:00 2001 From: Emilien Lemaire Date: Wed, 18 Dec 2024 13:36:12 +0100 Subject: [PATCH 1/2] Check for macos binaries --- .../superbol-vscode-platform/superbol_languageclient.ml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vscode/superbol-vscode-platform/superbol_languageclient.ml b/src/vscode/superbol-vscode-platform/superbol_languageclient.ml index 22da56dc2..f9c4f64a8 100644 --- a/src/vscode/superbol-vscode-platform/superbol_languageclient.ml +++ b/src/vscode/superbol-vscode-platform/superbol_languageclient.ml @@ -49,8 +49,10 @@ let find_superbol root = Format.asprintf "%s-%s-%s%s" prefix platform arch suffix; Format.asprintf "%s-%s%s" prefix platform suffix; Format.asprintf "%s%s" prefix suffix - ] - + ] @ if platform = "darwin" && arch = "arm64" then + [ Format.sprintf "%s-%s-%s%s" prefix platform "x64" suffix] + else + [] let scan_host_and_port url = let fail () = Format.ksprintf failwith "Invalid %S" url in From 7a087441a0a0e341e448b1fb2b23e62852a15463 Mon Sep 17 00:00:00 2001 From: Emilien Lemaire Date: Wed, 18 Dec 2024 13:38:19 +0100 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c0097fb6..97c656f60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [_] Next release ### Fixed +- Check for x86 binaries when on `darwin-arm64` [#385](https://github.com/OCamlPro/superbol-studio-oss/pull/385) - 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)