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

Jump to bottom

Add arm64ec platform expression #1352

Merged
merged 2 commits into from Feb 22, 2024
Merged

Add arm64ec platform expression #1352

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f37bced
Add arm64ec platform expression
autoantwort Feb 22, 2024
f2c2318
Update src/vcpkg/platform-expression.cpp
autoantwort Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/vcpkg/platform-expression.cpp
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@ namespace vcpkg::PlatformExpression
arm,
arm32,
arm64,
arm64ec,
wasm32,
mips64,

Expand Down Expand Up @@ -48,6 +49,7 @@ namespace vcpkg::PlatformExpression
{"arm", Identifier::arm},
{"arm32", Identifier::arm32},
{"arm64", Identifier::arm64},
{"arm64ec", Identifier::arm64ec},
{"wasm32", Identifier::wasm32},
{"mips64", Identifier::mips64},
{"windows", Identifier::windows},
Expand Down Expand Up @@ -543,9 +545,12 @@ namespace vcpkg::PlatformExpression
// For backwards compatability arm is also true for arm64.
// This is because it previously was only checking for a substring.
return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm") ||
true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm64");
true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm64") ||
true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm64ec");
autoantwort marked this conversation as resolved.
Show resolved Hide resolved
case Identifier::arm32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm");
case Identifier::arm64: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm64");
case Identifier::arm64ec:
return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm64ec");
case Identifier::windows:
return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "") ||
true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "WindowsStore") ||
Expand Down