Changeset View
Changeset View
Standalone View
Standalone View
lang/rust/files/patch-vendor_cc_src_lib.rs
| When the compiler has "clang" in its name the cc crate will pass | 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 | 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 | version and LLVM will default to FreeBSD 9 behavior, i.e., it will | ||||
| default to libstdc++ which is no longer available in newer releases. | default to libstdc++ which is no longer available in newer releases. | ||||
| To avoid this issue assume we have a GNU compatible toolchain instead | To avoid this issue assume we have a GNU compatible toolchain instead | ||||
| until LLVM can be updated to use libc++ by default. | until LLVM can be updated to use libc++ by default. | ||||
| https://reviews.llvm.org/D77776 | https://reviews.llvm.org/D77776 | ||||
| --- vendor/cc/src/lib.rs.orig 2020-04-14 08:55:10 UTC | --- vendor/cc/src/lib.rs.orig 2021-03-04 20:58:54 UTC | ||||
| +++ vendor/cc/src/lib.rs | +++ vendor/cc/src/lib.rs | ||||
| @@ -2353,28 +2353,7 @@ impl Tool { | @@ -2659,24 +2659,7 @@ impl Tool { | ||||
| } | } | ||||
| fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { | 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. | - // 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()) { | - let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) { | ||||
| - if fname.contains("clang-cl") { | - if fname.contains("clang-cl") { | ||||
| - ToolFamily::Msvc { clang_cl: true } | - ToolFamily::Msvc { clang_cl: true } | ||||
| - } else if fname.contains("cl") | - } else if fname.ends_with("cl") || fname == "cl.exe" { | ||||
| - && !fname.contains("cloudabi") | |||||
| - && !fname.contains("uclibc") | |||||
| - && !fname.contains("clang") | |||||
| - { | |||||
| - ToolFamily::Msvc { clang_cl: false } | - ToolFamily::Msvc { clang_cl: false } | ||||
| - } else if fname.contains("clang") { | - } else if fname.contains("clang") { | ||||
| - match clang_driver { | - match clang_driver { | ||||
| - Some("cl") => ToolFamily::Msvc { clang_cl: true }, | - Some("cl") => ToolFamily::Msvc { clang_cl: true }, | ||||
| - _ => ToolFamily::Clang, | - _ => ToolFamily::Clang, | ||||
| - } | - } | ||||
| - } else { | - } else { | ||||
| - ToolFamily::Gnu | - ToolFamily::Gnu | ||||
| Show All 9 Lines | |||||