diff options
author | Tobias Kortkamp <tobik@FreeBSD.org> | 2021-11-30 13:54:55 +0100 |
---|---|---|
committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2021-12-05 13:35:41 +0100 |
commit | 237b36fa2e73986dc19284686e80a47cb329bb6f (patch) | |
tree | abc3279705b006763706536c7330abed816a4690 /lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs | |
parent | x11/bemenu: Update to 0.6.4 (diff) |
lang/rust: Update to 1.57.0
- Unbreak build with LibreSSL 3.4.x [0]
- Disable backtrace's libunwind backend on armv* since it or
libunwind in base seem to be buggy and cause rustc to crash when
building some consumers [1]
- Follow rust-nightly in d5f09dc31fcfdb77b69c86b9093bf67ec67653d9
and reenable hardlinks in the build
Changes: https://blog.rust-lang.org/2021/12/02/Rust-1.57.0.html
PR: 259738 [0]
PR: 259799 [1]
PR: 260140
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D33190
With hat: rust
Diffstat (limited to 'lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs')
-rw-r--r-- | lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs b/lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs new file mode 100644 index 000000000000..1027757e0c34 --- /dev/null +++ b/lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs @@ -0,0 +1,38 @@ +When the compiler has "clang" in its name the cc crate will pass +an LLVM target triple to it. Rust uses a triple that lacks the OS +version and LLVM will default to FreeBSD 9 behavior, i.e., it will +default to libstdc++ which is no longer available in newer releases. + +To avoid this issue assume we have a GNU compatible toolchain instead +until LLVM can be updated to use libc++ by default. + +https://reviews.llvm.org/D77776 + +--- vendor/cc-1.0.69/src/lib.rs.orig 2021-03-04 20:58:54 UTC ++++ vendor/cc-1.0.69/src/lib.rs +@@ -2659,24 +2659,7 @@ impl Tool { + } + + fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { +- // Try to detect family of the tool from its name, falling back to Gnu. +- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) { +- if fname.contains("clang-cl") { +- ToolFamily::Msvc { clang_cl: true } +- } else if fname.ends_with("cl") || fname == "cl.exe" { +- ToolFamily::Msvc { clang_cl: false } +- } else if fname.contains("clang") { +- match clang_driver { +- Some("cl") => ToolFamily::Msvc { clang_cl: true }, +- _ => ToolFamily::Clang, +- } +- } else { +- ToolFamily::Gnu +- } +- } else { +- ToolFamily::Gnu +- }; +- ++ let family = ToolFamily::Gnu; + Tool { + path: path, + cc_wrapper_path: None, |