Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for macos binaries on ARM64 #385

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Check for macos binaries on ARM64 #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89e1ad4
Check for macos binaries
emilienlemaire Dec 18, 2024
7a08744
Add changelog entry
emilienlemaire Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 4 additions & 2 deletions src/vscode/superbol-vscode-platform/superbol_languageclient.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading