ports/lang/rust/files/patch-vendor_cc-1.0.69_src_lib.rs
Tobias Kortkamp 237b36fa2e
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 d5f09dc31f
  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
2021-12-05 13:35:41 +01:00

38 lines
1.5 KiB
Rust

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,