diff options
Diffstat (limited to 'lang/rust/files/patch-vendor_cc.rs')
| -rw-r--r-- | lang/rust/files/patch-vendor_cc.rs | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs index 69e7de424170..33c042330d85 100644 --- a/lang/rust/files/patch-vendor_cc.rs +++ b/lang/rust/files/patch-vendor_cc.rs @@ -21,9 +21,8 @@ https://reviews.llvm.org/D77776 (false, false, true) => Ok(ToolFamily::Gnu), (false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU"); - ---- vendor/cc-1.1.22/src/tool.rs.orig 2024-11-27 08:36:40.862061000 +0100 -+++ vendor/cc-1.1.22/src/tool.rs 2024-11-27 08:38:23.622042000 +0100 +--- vendor/cc-1.1.22/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.1.22/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -35,9 +34,21 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); - ---- vendor/cc-1.1.23/src/tool.rs.orig 2024-11-27 08:36:40.862061000 +0100 -+++ vendor/cc-1.1.23/src/tool.rs 2024-11-27 08:38:23.622042000 +0100 +--- vendor/cc-1.1.34/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.1.34/src/tool.rs +@@ -174,9 +174,7 @@ impl Tool { + + match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { + (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), +- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { +- zig_cc: is_zig_cc(path, cargo_output), +- }), ++ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), + (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), + (false, false, false, false, false) => { + cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); +--- vendor/cc-1.2.5/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.2.5/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { |