diff options
| author | bors <bors@rust-lang.org> | 2023-04-03 19:53:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-03 19:53:24 +0000 |
| commit | 48829ea74bcb8808f9af5cbb1173f01ff865ff1d (patch) | |
| tree | 4f61886fac549aca42b540f67dc2566282567bb4 | |
| parent | bf41e753ec60da69f2393850ec5035063a573d95 (diff) | |
| parent | 09541b5e1b3d35b932fed363eac9b83a11ca4136 (diff) | |
| download | rust-48829ea74bcb8808f9af5cbb1173f01ff865ff1d.tar.gz rust-48829ea74bcb8808f9af5cbb1173f01ff865ff1d.zip | |
Auto merge of #109771 - uweigand:s390x-miri-libffi, r=oli-obk
Increase libffi version to 3.2 to support s390x libffi versions prior to 3.2 have no support for s390x, causing the Miri build to fail on our platform.
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | src/tools/miri/Cargo.toml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 952c9e865a8..c7bd689b2d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2950,9 +2950,9 @@ dependencies = [ [[package]] name = "libffi" -version = "3.0.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e454b3efb16fba3b17810ae5e41df02b649e564ab3c5a34b3b93ed07ad287e6" +checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2" dependencies = [ "libc", "libffi-sys", @@ -2960,9 +2960,9 @@ dependencies = [ [[package]] name = "libffi-sys" -version = "2.0.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4106b7f09d7b87d021334d5618fac1dfcfb824d4c5fe111ff0074dfd242e15" +checksum = "dc65067b78c0fc069771e8b9a9e02df71e08858bec92c1f101377c67b9dca7c7" dependencies = [ "cc", ] diff --git a/src/tools/miri/Cargo.toml b/src/tools/miri/Cargo.toml index 717020f43c4..6705bf7b007 100644 --- a/src/tools/miri/Cargo.toml +++ b/src/tools/miri/Cargo.toml @@ -34,7 +34,7 @@ measureme = "10.0.0" libc = "0.2" [target.'cfg(target_os = "linux")'.dependencies] -libffi = "3.0.0" +libffi = "3.2.0" libloading = "0.7" [dev-dependencies] |