From 65175e88384344ecff410b8b3fe6c6cd952c96fa Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 12 May 2025 15:55:30 +0300 Subject: =?UTF-8?q?lang/rust-nightly:=20update=201.88.0.20250427=20?= =?UTF-8?q?=E2=86=92=201.89.0.20250511?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Approved by: rust (implicit) --- lang/rust-nightly/files/patch-vendor_cc.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'lang/rust-nightly/files/patch-vendor_cc.rs') diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index a535d9677b91..3e9a42a7f8dd 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -21,19 +21,6 @@ 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-12-10 13:16:09 UTC -+++ vendor/cc-1.1.22/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.0/src/tool.rs.orig 2024-12-10 13:16:09 UTC +++ vendor/cc-1.2.0/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { @@ -73,8 +60,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.19/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.19/src/tool.rs +--- vendor/cc-1.2.21/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.21/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { -- cgit v1.2.3