Fix rustbuild to work with --libdir. #39206
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
Similar to the makefiles, pass CFG_LIBDIR_RELATIVE to cargo when building rustc in stages > 0. This tells rustc to check the different directory.
MJDSys
force-pushed
the
fix_rustbuild_libdir
branch
from
cd26cae to
4c02d9f
Compare
|
@bors: r+ Looks good to me, thanks! Have you found that rustbuild doesn't work out for you? |
|
📌 Commit 4c02d9f has been approved by |
|
@alexcrichton I haven't really dug into it. I install rust through Gentoo's packaging, which compiles it all fresh. The switch over broke libdir handling, but that gave me an excuse to dig into rust's compiler :) Otherwise I haven't really played with it. I did find it acted surprising, but based on what I've read of rust build system that might not be rustbuild's fault. And I'd want to read/understand it more before writing issues. I'll probably raise a conversation on the internals discourse about libdir handling on Linux, seeing as there are todos all over that. Or would that be better done on a Github issue? That being said, when I ask it to build rust, especially with this patch, it does work. At the end of the day, that's what really matters. And it was definitely easier to understand this rust code over the makefiles. |
|
@MJDSys ok, thanks for the info! I think it's fine to file issues for bugs you find, but general discussion can probably happen on internals. Other than that glad to hear this is working, and also that it was easier to understand than makefiles! |
Fix rustbuild to work with --libdir. Similar to the makefiles, pass CFG_LIBDIR_RELATIVE to cargo when building rustc in stages > 0. This tells rustc to check the different directory. I'm not sure how you want this handled in the toml system (my distribution, Gentoo, uses configure still). I have a feeling the system needs a rework anyways for rustbuild. If there is some discussion that needs to happen, could you merge this in the mean time? I'd be happy to help transition this to a better method.
|
☀️ Test successful - status-appveyor, status-travis |
Similar to the makefiles, pass CFG_LIBDIR_RELATIVE to cargo when building
rustc in stages > 0. This tells rustc to check the different directory.
I'm not sure how you want this handled in the toml system (my distribution, Gentoo, uses configure still). I have a feeling the system needs a rework anyways for rustbuild. If there is some discussion that needs to happen, could you merge this in the mean time? I'd be happy to help transition this to a better method.