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

Support cross-compiling to aarch64 on MSVC #159

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Support cross-compiling to aarch64 on MSVC #159

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/sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Install rust toolchain
uses: hecrj/setup-rust-action@v1
- run: cargo install xwin
- run: xwin --accept-license splat --output Windows.sdk
- run: xwin --accept-license --arch aarch64,x86_64 splat --output Windows.sdk
- run: tar --zstd -cf Windows.sdk.tar.zst Windows.sdk
- run: gh release upload $TAG Windows.sdk.tar.zst -R rust-mobile/xbuild
env:
Expand Down
10 changes: 7 additions & 3 deletions xbuild/src/cargo/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,13 @@ impl CargoBuild {
self.add_include_dir(&path.join("sdk").join("include").join("um"));
self.add_include_dir(&path.join("sdk").join("include").join("ucrt"));
self.add_include_dir(&path.join("sdk").join("include").join("shared"));
self.add_lib_dir(&path.join("crt").join("lib").join("x86_64"));
self.add_lib_dir(&path.join("sdk").join("lib").join("um").join("x86_64"));
self.add_lib_dir(&path.join("sdk").join("lib").join("ucrt").join("x86_64"));
let arch_folder = match self.target.arch() {
crate::Arch::Arm64 => "aarch64",
crate::Arch::X64 => "x86_64",
};
self.add_lib_dir(&path.join("crt").join("lib").join(arch_folder));
self.add_lib_dir(&path.join("sdk").join("lib").join("um").join(arch_folder));
self.add_lib_dir(&path.join("sdk").join("lib").join("ucrt").join(arch_folder));
Ok(())
}

Expand Down
Loading