-
Notifications
You must be signed in to change notification settings - Fork 460
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.
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
Fix Windows ARM64 Detection #803
Conversation
@@ -6,7 +6,7 @@ function(dispatch_windows_arch_spelling arch var) | |||
set(${var} x64 PARENT_SCOPE) | |||
elseif(${arch} STREQUAL armv7) | |||
set(${var} arm PARENT_SCOPE) | |||
elseif(${arch} STREQUAL aarch64) | |||
elseif(${arch} STREQUAL aarch64 OR ${arch} STREQUAL ARM64) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not use MATCHES
? I'm not sure how I didn't hit this though as I've been using Swift on Windows ARM64 for a while.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am running on a prerelease version from late 2022, maybe they changed the architecture name later on.
Why not use MATCHES?
I was just adapting the method used for x64 and AMD64 detection. Should I change it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would there be a simple way to also support cross-compiling on Windows using the respective VS environments e.g. by looking at the |
@compnerd Given the previous use of |
Eh, I suppose that it is fine as is. |
@swift-ci please test |
Hmm, actually, is this still needed after #812? |
Nope |
CMAKE_SYSTEM_PROCESSOR returns ARM64 and not aarch64 (cmake version 3.27.9).
systeminfo: