Attachment 213386 Details for Bug 238556 – rust-clang.diff

[patch] rust-clang.diff

rust-clang.diff (text/plain), 2.25 KB, created by Tobias Kortkamp on 2020-04-14 09:09:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2020-04-14 09:09:00 UTC

Size: 2.25 KB

patch

obsolete

>Index: lang/rust/files/patch-vendor_cc_src_lib.rs
>===================================================================
>--- lang/rust/files/patch-vendor_cc_src_lib.rs	(nonexistent)
>+++ lang/rust/files/patch-vendor_cc_src_lib.rs	(working copy)
>@@ -0,0 +1,43 @@
>+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,8 @@ 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
>+-        };
>+-
>++        // We are Gnu
>++        let family = ToolFamily::Gnu;
>+         Tool {
>+             path: path,
>+             cc_wrapper_path: None,
>
>Property changes on: lang/rust/files/patch-vendor_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 238556: 205053 | 213386