-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Search codegen backends based on target libdir instead of sysroot #57101
Conversation
Fixes cases with custom libdir when it consists of two or more parts.
r? @davidtwco (rust_highfive has picked a reviewer for you, use r? to override) |
@bors: r+ |
📌 Commit 4e7d53d has been approved by |
Search codegen backends based on target libdir instead of sysroot Fixes rust-lang#57014 Fixes cases with custom libdir when it consists of two or more parts.
Search codegen backends based on target libdir instead of sysroot Fixes #57014 Fixes cases with custom libdir when it consists of two or more parts.
☀️ Test successful - status-appveyor, status-travis |
Tested on commit rust-lang/rust@6861426. Direct link to PR: <rust-lang/rust#57101> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
Uh... any idea why this would affect Miri only on Windows, and what we could do about that? The error is
|
It's strange. What is correct place of codegen library? |
I have no idea, I hoped you'd tell me.^^ |
I suppose it could be broken because windows places dynamic libraries in the "bin" folder. |
I'm afraid other tools will fail as well but they were already broken. |
Unfortunately it broke all the tools for MSVC target: #57303
That's correct, for both Windows target |
How are executable binaries and codegen and rustc_driver libraries placed on windows? It looks like it requires other way to calculate target libdir and codegen folder. |
They would have been fixed by #57303 but the pr broke them in a way I cannot fix as I don't have windows. Could you please provide a fix for this? |
Generally the only difference in files placement between UNIX and Windows (MinGW at least) should be runtime lib placement. On UNIX they are inside Here is the tree of MinGW toolchain installed with rustup: tree.txt |
I could try to fix it after tomorrow. I think it better to revert PR now and then I try to fix it. |
This reverts commit 6861426, reversing changes made to cae623c. Should fix tools on windows. Reopens rust-lang#57014
Fixes #57014
Fixes cases with custom libdir when it consists of two or more parts.