-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
rust: Update to 1.61.0 #11700
rust: Update to 1.61.0 #11700
Conversation
Strange... |
there is no rust in clang32, so the job doesn't do anything. |
d243516
to
22f52b1
Compare
I think you will at least need to disable |
Error on CLANG64
|
Error on MINGW64
|
Disabling |
The mingw build fails when building It chokes on some part of The test on modifiers was added by rust-lang/rust@1004783 |
It is the |
I believe
I think disabling this chunk: if lib.has_modifiers() || passed_lib.has_modifiers() {
self.tcx.sess.span_err(
self.tcx.def_span(lib.foreign_module.unwrap()),
"overriding linking modifiers from command line is not supported"
);
} would work as a very ugly workaround. I'll look for a fix or better workaround sometime this week. EDIT: |
8291788
to
afba330
Compare
Is it ok that the And the |
I pushed a patch that ignores |
I think we disable this line for Clang subsystems anyway so we could do the same for GCC.
For our use case linking shared pthread library would be preferable. It's only for linking Rust and doesn't affect binaries built with Rust. |
Actually we add ffi for all systems : https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-rust/0001-add-missing-libs.patch
So, do we want to go with the proposed fix ? |
I think it shouldn't be necessary since couple Rust releases because now it asks
I don't mind merging what is in this PR either. |
I'll take a look at cleaning up this patch. EDIT : just to confirm, we should continue adding |
Oof, I thought I was fixed already but apparently not:
So yeah, we have to keep adding |
bcd5d25
to
cbc0e3c
Compare
Fixes a number of issues in compiler/rustc_llvm regarding lib handling. This is a moving part in current rust releases... - Disabled llvm-static-stdcpp Fixes CLANG64 build error: thread 'main' panicked at 'assertion failed: !cxxflags.contains(\"stdlib=libc++\")', compiler\rustc_llvm\build.rs:351:13 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - Removed `pthread` from forced libs in compiler/rustc_llvm/build.rs `pthread` is also provided by llvm-config and having both now triggers an error about mixed link modifiers. See rust-lang/rust#97299 $ llvm-config --system-libs --link-static -lpsapi -lshell32 -lole32 -luuid -ladvapi32 -lpthread -lz -lxml2 Note that `ffi` is still forced by the patch as llvm-config does not provide it. See 0001-rustc-llvm-fix-libs.patch (replaces 0001-add-missing-libs.patch). - Rebased 0007-clang-subsystem.patch
Fixes a number of issues in compiler/rustc_llvm regarding lib handling.
Note that
|
Tested the MINGW64 build. Looks good. |
No description provided.