Skip to content

Fix macOS dotnet root discovery #45

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

Merged
merged 1 commit into from
Jan 3, 2023
Merged

Fix macOS dotnet root discovery #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix macOS dotnet root discovery
  • Loading branch information
@filmor
filmor committed Jan 3, 2023
commit c9a6ac8e8227824af1175d9e5b180f2aa516a7f3
5 changes: 3 additions & 2 deletions clr_loader/util/find.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
import os.path
import platform
import shutil
import sys
from pathlib import Path
Expand Down Expand Up @@ -42,7 +42,8 @@ def find_dotnet_root() -> Path:
prog_files = Path(prog_files)
dotnet_root = prog_files / "dotnet"
elif sys.platform == "darwin":
if sys.maxsize > 2**32: # is_64bits
if "ARM64" in os.uname().version and platform.machine() == "x86_64":
# Apple Silicon in Rosetta 2 mode
dotnet_root = Path("/usr/local/share/dotnet/x64")
else:
dotnet_root = Path("/usr/local/share/dotnet")
Expand Down