Merge pull request #385 from emilienlemaire/fix-macos-bundle-bin

Check for macos binaries on ARM64
OCamlPro · Dec 18, 2024 · 922588f · 922588f
2 parents e8edfbc + 7a08744
commit 922588f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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)
 

diff --git 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