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.

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 the host architecture Windows 10 SDK bin directory to the PATH, not the target #524

Merged
merged 1 commit into from
Jul 2, 2020

Conversation

arlosi
Copy link
Contributor

@arlosi arlosi commented Jul 1, 2020

Fixes failures during cross-compilation when the host cannot execute the target architecture Windows 10 SDK tools.

@alexcrichton
Copy link
Member

Thanks for this! Would it be possible to add a test for this on CI?

…ot the target.

Fixes failures during cross-compilation when the host cannot execute the target architecture
Windows 10 SDK tools.

Also adds the target tools bin to the PATH before the host_dylib_path is added. This ensures that if
a target-specific version of a tool is available, it is preferred.
@arlosi
Copy link
Contributor Author

arlosi commented Jul 2, 2020

I added a CI task targeting aarch64 -- hopefully did that right.

The tests already include running rc (which ships in the Windows Kits). Without this change, it will attempt to run the aarch64 version of the tool on the x86_64 host.

I also manually ran the aarch64 tests locally.

@alexcrichton alexcrichton merged commit 2d99120 into rust-lang:master Jul 2, 2020
@alexcrichton
Copy link
Member

👍 Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants