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

Handle ARM64 MSVC paths when cross-compiling on Windows #13073

Merged
merged 1 commit into from
Feb 15, 2023
Merged

Handle ARM64 MSVC paths when cross-compiling on Windows #13073

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
2 changes: 1 addition & 1 deletion .github/workflows/win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ jobs:
if: steps.cache-llvm.outputs.cache-hit != 'true'
working-directory: ./llvm-src
run: |
cmake . -Thost=x64 -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_USE_CRT_RELEASE=MT -DBUILD_SHARED_LIBS=OFF -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF
cmake . -Thost=x64 -DLLVM_TARGETS_TO_BUILD="X86;AArch64" -DLLVM_USE_CRT_RELEASE=MT -DBUILD_SHARED_LIBS=OFF -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF
cmake --build . --config Release
- name: Gather LLVM
if: steps.cache-llvm.outputs.cache-hit != 'true'
Expand Down
6 changes: 4 additions & 2 deletions src/compiler/crystal/compiler.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ module Crystal
{% if flag?(:msvc) %}
if msvc_path = Crystal::System::VisualStudio.find_latest_msvc_path
if win_sdk_libpath = Crystal::System::WindowsSDK.find_win10_sdk_libpath
host_bits = {{ flag?(:bits64) ? "x64" : "x86" }}
target_bits = program.has_flag?("bits64") ? "x64" : "x86"
host_bits = {{ flag?(:aarch64) ? "ARM64" : flag?(:bits64) ? "x64" : "x86" }}
target_bits = program.has_flag?("aarch64") ? "arm64" : program.has_flag?("bits64") ? "x64" : "x86"

# MSVC build tools and Windows SDK found; recreate `LIB` environment variable
# that is normally expected on the MSVC developer command prompt
Expand All @@ -352,6 +352,8 @@ module Crystal
link_args << Process.quote_windows("/LIBPATH:#{win_sdk_libpath.join("um", target_bits)}")

# use exact path for compiler instead of relying on `PATH`
# (letter case shouldn't matter in most cases but being exact doesn't hurt here)
target_bits = target_bits.sub("arm", "ARM")
cl = Process.quote_windows(msvc_path.join("bin", "Host#{host_bits}", target_bits, "cl.exe").to_s)
end
end
Expand Down