diff options
Diffstat (limited to 'lang/rust/files')
| -rw-r--r-- | lang/rust/files/patch-vendor_cc.rs | 25 | ||||
| -rw-r--r-- | lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c | 2 |
2 files changed, 7 insertions, 20 deletions
diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs index 4bc3a7b24e42..dbcbe5771fdd 100644 --- a/lang/rust/files/patch-vendor_cc.rs +++ b/lang/rust/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-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) { - (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-05-09 18:20:47 UTC +++ vendor/cc-1.2.0/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { @@ -47,8 +34,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.10/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.10/src/tool.rs +--- vendor/cc-1.2.16/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.2.16/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -60,8 +47,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.16/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.16/src/tool.rs +--- vendor/cc-1.2.17/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.2.17/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -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.17/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.17/src/tool.rs +--- vendor/cc-1.2.21/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.2.21/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { diff --git a/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c index 95c749f9d63b..87c398a91538 100644 --- a/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c +++ b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c @@ -8,7 +8,7 @@ https://github.com/openssl/openssl/commit/65787e2dc219685c30539c6f60eb6b64b890bf # define BROKEN_CLANG_ATOMICS #endif -+#if defined(__FreeBSD__) && defined(__i386__) ++#if defined(__FreeBSD__) && (defined(__i386__) || (defined(__powerpc__) && defined(__ILP32__))) +#define BROKEN_CLANG_ATOMICS +#endif + |