View | Details | Raw Unified | Return to bug 251480 | Differences between
and this patch

Collapse All | Expand All

(-)lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs (+32 lines)
Line 0 Link Here
1 
--- third_party/rust/cc/src/lib.rs.orig	2020-10-14 09:34:53 UTC
2 
+++ third_party/rust/cc/src/lib.rs
3 
@@ -2344,28 +2344,7 @@ impl Tool {
4 
     }
5
6 
     fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
7 
-        // Try to detect family of the tool from its name, falling back to Gnu.
8 
-        let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
9 
-            if fname.contains("clang-cl") {
10 
-                ToolFamily::Msvc { clang_cl: true }
11 
-            } else if fname.contains("cl")
12 
-                && !fname.contains("cloudabi")
13 
-                && !fname.contains("uclibc")
14 
-                && !fname.contains("clang")
15 
-            {
16 
-                ToolFamily::Msvc { clang_cl: false }
17 
-            } else if fname.contains("clang") {
18 
-                match clang_driver {
19 
-                    Some("cl") => ToolFamily::Msvc { clang_cl: true },
20 
-                    _ => ToolFamily::Clang,
21 
-                }
22 
-            } else {
23 
-                ToolFamily::Gnu
24 
-            }
25 
-        } else {
26 
-            ToolFamily::Gnu
27 
-        };
28 
-
29 
+        let family = ToolFamily::Gnu;
30 
         Tool {
31 
             path: path,
32 
             cc_wrapper_path: None,

Return to bug 251480