summaryrefslogtreecommitdiff
path: root/www/librewolf/files/patch-bug1628567
diff options
context:
space:
mode:
authorMartin Filla <freebsd@sysctl.cz>2023-01-19 19:52:57 +0100
committerJesper Schmitz Mouridsen <jsm@FreeBSD.org>2023-01-21 19:34:48 +0100
commit4e77dee79c17245e0c3b4b98af5a718ed2c5eb81 (patch)
tree1af2a1c76c0c6d33307e7456f888546cf0ded567 /www/librewolf/files/patch-bug1628567
parentsecurity/openscep: Mark DEPRECATED (diff)
www/librewolf: New port
PR: 258503
Diffstat (limited to 'www/librewolf/files/patch-bug1628567')
-rw-r--r--www/librewolf/files/patch-bug162856732
1 files changed, 32 insertions, 0 deletions
diff --git a/www/librewolf/files/patch-bug1628567 b/www/librewolf/files/patch-bug1628567
new file mode 100644
index 000000000000..003ba36d3ad1
--- /dev/null
+++ b/www/librewolf/files/patch-bug1628567
@@ -0,0 +1,32 @@
+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,