diff options
| author | Antoni Boucher <bouanto@zoho.com> | 2024-02-20 10:35:56 -0500 |
|---|---|---|
| committer | Antoni Boucher <bouanto@zoho.com> | 2024-02-20 10:42:37 -0500 |
| commit | c3d5b7fe3ba0c2b04fcd4a7d2ebdb1ab9e357b6e (patch) | |
| tree | 80a2e7d81626b5b1db736fa0145ec7ee744617e0 | |
| parent | f6e16e95df4ebe6e954ba4c9021e28205c88703c (diff) | |
| download | rust-c3d5b7fe3ba0c2b04fcd4a7d2ebdb1ab9e357b6e.tar.gz rust-c3d5b7fe3ba0c2b04fcd4a7d2ebdb1ab9e357b6e.zip | |
Fix patches
| -rw-r--r-- | patches/0022-core-Disable-not-compiling-tests.patch | 4 | ||||
| -rw-r--r-- | patches/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch | 16 |
2 files changed, 1 insertions, 19 deletions
diff --git a/patches/0022-core-Disable-not-compiling-tests.patch b/patches/0022-core-Disable-not-compiling-tests.patch index 4db56fa3bd2..a7d523f9408 100644 --- a/patches/0022-core-Disable-not-compiling-tests.patch +++ b/patches/0022-core-Disable-not-compiling-tests.patch @@ -39,6 +39,4 @@ index 42a26ae..5ac1042 100644 +#![cfg(test)] #![feature(alloc_layout_extra)] #![feature(array_chunks)] - #![feature(array_methods)] --- -2.21.0 (Apple Git-122) + #![feature(array_windows)] diff --git a/patches/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch b/patches/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch index 74d9c208a05..c220f53040f 100644 --- a/patches/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch +++ b/patches/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch @@ -21,19 +21,3 @@ index 5b21355..cb0c49b 100644 [dependencies] alloc = { path = "../alloc", public = true } -diff --git a/library/test/Cargo.toml b/library/test/Cargo.toml -index 91a1abd..a58c160 100644 ---- a/library/test/Cargo.toml -+++ b/library/test/Cargo.toml -@@ -4,7 +4,7 @@ version = "0.0.0" - edition = "2021" - - [lib] --crate-type = ["dylib", "rlib"] -+crate-type = ["rlib"] - - [dependencies] - getopts = { version = "0.2.21", features = ['rustc-dep-of-std'] } --- -2.42.0 - |