Attachment 220142 Details for Bug 251480 – v0

[patch] v0

lang_spidermonkey78.diff (text/plain), 1.91 KB, created by Mikael Urankar on 2020-12-01 17:58:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2020-12-01 17:58:21 UTC

Size: 1.91 KB

patch

obsolete

>Index: lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
>===================================================================
>--- lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs	(nonexistent)
>+++ lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs	(working copy)
>@@ -0,0 +1,32 @@
>+--- third_party/rust/cc/src/lib.rs.orig	2020-10-14 09:34:53 UTC
>++++ third_party/rust/cc/src/lib.rs
>+@@ -2344,28 +2344,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,
>
>Property changes on: lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 251480: 220142 | 220169 | 220170 | 220661 | 220668 | 220669