Skip to content

Commit e84e8f4

Browse files
authored
Rollup merge of #105222 - devnexen:fbsd_update_img, r=petrochenkov
std update libc version and freebsd image build dependencies
2 parents 78cf0b9 + 71cf892 commit e84e8f4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -2085,9 +2085,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
20852085

20862086
[[package]]
20872087
name = "libc"
2088-
version = "0.2.135"
2088+
version = "0.2.138"
20892089
source = "registry+https://github.com/rust-lang/crates.io-index"
2090-
checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
2090+
checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
20912091
dependencies = [
20922092
"rustc-std-workspace-core",
20932093
]

library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
1515
panic_unwind = { path = "../panic_unwind", optional = true }
1616
panic_abort = { path = "../panic_abort" }
1717
core = { path = "../core" }
18-
libc = { version = "0.2.135", default-features = false, features = ['rustc-dep-of-std'] }
18+
libc = { version = "0.2.138", default-features = false, features = ['rustc-dep-of-std'] }
1919
compiler_builtins = { version = "0.1.82" }
2020
profiler_builtins = { path = "../profiler_builtins", optional = true }
2121
unwind = { path = "../unwind" }

src/ci/docker/scripts/freebsd-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ files_to_extract=(
5353
for lib in c cxxrt gcc_s m thr util; do
5454
files_to_extract=("${files_to_extract[@]}" "./lib/lib${lib}.*" "./usr/lib/lib${lib}.*")
5555
done
56-
for lib in c++ c_nonshared compiler_rt execinfo gcc pthread rt ssp_nonshared procstat devstat kvm; do
56+
for lib in c++ c_nonshared compiler_rt execinfo gcc pthread rt ssp_nonshared procstat devstat kvm memstat; do
5757
files_to_extract=("${files_to_extract[@]}" "./usr/lib/lib${lib}.*")
5858
done
5959

0 commit comments

Comments
 (0)