Skip to content

Commit f2e6009

Browse files
authored
rs-cross: upgrade rust to 1.81.0, openssl to 0.10.70 (#37)
1 parent a8e9163 commit f2e6009

File tree

4 files changed

+39
-30
lines changed

4 files changed

+39
-30
lines changed

Cargo.lock

Lines changed: 34 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix-cross-rs/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77
[dependencies]
8-
rand = "0.3.14"
8+
rand = "0.4.6"
99
# The following commit breaks cross builds
1010
#zstd = { git = "https://github.com/gyscos/zstd-rs", rev ="f0d8a12f0f520095cf26a0dac35b8d0939277add" }
1111
# The following commit results in a successful build, which reverts the above commit
12-
zstd = { git = "https://github.com/syncom/zstd-rs", rev ="abbc3b6a21c9825243933cbb6778781608db56dc" }
12+
zstd = { git = "https://github.com/syncom/zstd-rs", rev ="abbc3b6a21c9825243933cbb6778781608db56dc" }
13+
openssl = { version = "0.10.70", features = ["vendored"] }

nix-cross-rs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mkfile_dir := $(dir $(mkfile_path))
44
all: cross-build
55

66
cross-build:
7-
$(mkfile_dir)/run.sh 2>/dev/null
7+
$(mkfile_dir)/run.sh
88

99
clean:
1010
rm -rf $(mkfile_dir)/out

nix-cross-rs/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.80.1
1+
1.81.0

0 commit comments

Comments
 (0)