mirror of
https://git.freebsd.org/ports.git
synced 2025-07-03 10:29:15 -04:00
32 lines
1.2 KiB
Text
32 lines
1.2 KiB
Text
Don't pass --target when CC/CXX contains clang
|
|
|
|
diff --git third_party/rust/cc/src/lib.rs third_party/rust/cc/src/lib.rs
|
|
index 8cafd2a..f40b746 100644
|
|
--- third_party/rust/cc/src/lib.rs
|
|
+++ third_party/rust/cc/src/lib.rs
|
|
@@ -2796,24 +2796,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,
|