aboutsummaryrefslogtreecommitdiff
path: root/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2020-12-27 16:08:20 +0000
committerSteve Wills <swills@FreeBSD.org>2020-12-27 16:08:20 +0000
commite7f344d219b98e03c13c925932373ba9fd56554c (patch)
treeb4ffb32df47a8a001884267d638b312ce8474612 /lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
parentc0b8a48dd998644c1286d1f0ddf22b202a95953b (diff)
downloadports-e7f344d219b98e03c13c925932373ba9fd56554c.tar.gz
ports-e7f344d219b98e03c13c925932373ba9fd56554c.zip
lang/spidermonkey78: update to 78.6.0 [1]
While here, allow building with system clang 10 on 12.2 [2] PR: 251895 [1] PR: 251480 [2] Submitted by: mikael, janm@transactionware.com [2] Exp-run by: antoine [1] Reported by: janm@transactionware.com [2]
Notes
Notes: svn path=/head/; revision=559369
Diffstat (limited to 'lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs')
-rw-r--r--lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs32
1 files changed, 32 insertions, 0 deletions
diff --git a/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs b/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
new file mode 100644
index 000000000000..9c04ba1845c4
--- /dev/null
+++ b/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs
@@ -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,