diff options
| author | bors <bors@rust-lang.org> | 2025-01-28 14:17:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-28 14:17:54 +0000 |
| commit | fdd1a3b02687817cea41f6bacae3d5fbed2b2cd0 (patch) | |
| tree | b4856af437b6e5e31008d52230bfe3e45bb164ad /src/ci/docker | |
| parent | aa6f5ab18e67cb815f73e0d53d217bc54b0da924 (diff) | |
| parent | 9a192b254cb25dd2b75274ee0d0d831c3ddb8220 (diff) | |
| download | rust-fdd1a3b02687817cea41f6bacae3d5fbed2b2cd0.tar.gz rust-fdd1a3b02687817cea41f6bacae3d5fbed2b2cd0.zip | |
Auto merge of #136185 - matthiaskrgr:rollup-zqzy6wb, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #133151 (Trim extra whitespace in fn ptr suggestion span) - #133829 (Implement `AtomicT::update` & `AtomicT::try_update`) - #135367 (Enable `unreachable_pub` lint in `alloc`) - #135748 (Lower index bounds checking to `PtrMetadata`, this time with the right fake borrow semantics 😸) - #135805 (Add missing allocator safety in alloc crate) - #135886 (Document purpose of closure in from_fn.rs more clearly) - #135961 (Fix 2/4 tests skipped by opt-dist) - #136012 (Document powf and powi values that are always 1.0) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile | 1 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile b/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile index 6f33c632181..2b8a3f829c6 100644 --- a/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile +++ b/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile @@ -20,6 +20,7 @@ RUN yum upgrade -y && \ gcc-c++ \ git \ glibc-devel \ + glibc-static \ libedit-devel \ libstdc++-devel \ make \ diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 3a396230582..0b4682ac32b 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -21,6 +21,8 @@ RUN yum upgrade -y && \ git \ glibc-devel.i686 \ glibc-devel.x86_64 \ + glibc-static.i686 \ + glibc-static.x86_64 \ libedit-devel \ libstdc++-devel.i686 \ libstdc++-devel.x86_64 \ |