diff options
Diffstat (limited to 'lang/rust-nightly/files')
| -rw-r--r-- | lang/rust-nightly/files/patch-vendor_cc.rs | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index 759b8ab321cd..4a763326e4f6 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -86,8 +86,8 @@ 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.2.22/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.22/src/tool.rs +--- vendor/cc-1.2.23/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.23/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -99,8 +99,34 @@ 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.2.23/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.23/src/tool.rs +--- vendor/cc-1.2.25/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.25/src/tool.rs +@@ -141,9 +141,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.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.26/src/tool.rs +@@ -141,9 +141,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.27/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.27/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { |