forked from Lainports/freebsd-ports
5abe8902a5
- Add workaround to fix build when CC/CXX have "clang" in them [1] - Respect AR to fix build with external toolchains [2] - Force rebuild all consumers to catch regressions early Changes: https://blog.rust-lang.org/2020/04/23/Rust-1.43.0.html PR: 238556 [1], 245583 [2] Reported by: Matthias Apitz <guru@unixarea.de> [1], Greg V <greg@unrelenting.technology> [2] Tested by: mikael, pkubaj, tobik With hat: rust Differential Revision: https://reviews.freebsd.org/D24521
42 lines
1.6 KiB
Rust
42 lines
1.6 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/src/lib.rs.orig 2020-04-14 08:55:10 UTC
|
|
+++ vendor/cc/src/lib.rs
|
|
@@ -2353,28 +2353,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.contains("cl")
|
|
- && !fname.contains("cloudabi")
|
|
- && !fname.contains("uclibc")
|
|
- && !fname.contains("clang")
|
|
- {
|
|
- 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,
|