mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #109771 - uweigand:s390x-miri-libffi, r=oli-obk

Browse Source 
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.
This commit is contained in:
bors 2023-04-03 19:53:24 +00:00
commit 48829ea74b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock
View File

@ -2950,9 +2950,9 @@ dependencies = [
[[package]] [[package]]
name = "libffi" name = "libffi"
version = "3.0.1" version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e454b3efb16fba3b17810ae5e41df02b649e564ab3c5a34b3b93ed07ad287e6" checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2"
dependencies = [ dependencies = [
"libc", "libc",
"libffi-sys", "libffi-sys",
@ -2960,9 +2960,9 @@ dependencies = [
[[package]] [[package]]
name = "libffi-sys" name = "libffi-sys"
version = "2.0.0" version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab4106b7f09d7b87d021334d5618fac1dfcfb824d4c5fe111ff0074dfd242e15" checksum = "dc65067b78c0fc069771e8b9a9e02df71e08858bec92c1f101377c67b9dca7c7"
dependencies = [ dependencies = [
"cc", "cc",
] ]

2
src/tools/miri/Cargo.toml
View File

@ -34,7 +34,7 @@ measureme = "10.0.0"
libc = "0.2" libc = "0.2"
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
libffi = "3.0.0" libffi = "3.2.0"
libloading = "0.7" libloading = "0.7"
[dev-dependencies] [dev-dependencies]