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

Add win-arm64 support #2745

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Add win-arm64 support #2745

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions libmamba/include/mamba/specs/platform.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ namespace mamba::specs
osx_arm64,
win_32,
win_64,
win_arm64,
};

/**
Expand Down
2 changes: 1 addition & 1 deletion libmamba/src/core/channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace mamba
const std::vector<std::string> KNOWN_PLATFORMS = {
"noarch", "linux-32", "linux-64", "linux-aarch64", "linux-armv6l",
"linux-armv7l", "linux-ppc64le", "linux-ppc64", "osx-64", "osx-arm64",
"win-32", "win-64", "zos-z"
"win-32", "win-64", "win-arm64", "zos-z"
};
} // namespace

Expand Down
9 changes: 9 additions & 0 deletions libmamba/src/specs/platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ namespace mamba::specs
return "win-32";
case Platform::win_64:
return "win-64";
case Platform::win_arm64:
return "win-arm64";
default:
// All enum cases must be handled
assert(false);
Expand All @@ -76,6 +78,7 @@ namespace mamba::specs
Platform::osx_arm64,
Platform::win_32,
Platform::win_64,
Platform::win_arm64,
})
{
if (str_clean == platform_name(p))
Expand Down Expand Up @@ -136,7 +139,13 @@ namespace mamba::specs
#endif

#elif defined(_WIN64)
#if defined(_M_AMD64)
return Platform::win_64;
#elif defined(_M_ARM64)
return Platform::win_arm64;
#else
#error "Unknown Windows platform"
#endif
#elif defined(_WIN32)
return Platform::win_32;

Expand Down