diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-28 14:23:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-28 14:23:24 +0100 |
| commit | da6d9fdfa2be8def63e1adeb7fd14c972db9d2bf (patch) | |
| tree | e01821b3009dc0b151be83b02eb1466533b8bb37 /src/ci/docker | |
| parent | 448fa117f8c0beed21967cc732a289ad526ffff4 (diff) | |
| parent | 1f4309cec4462ea76a2c7a89fa0aff3d1782e60b (diff) | |
| download | rust-da6d9fdfa2be8def63e1adeb7fd14c972db9d2bf.tar.gz rust-da6d9fdfa2be8def63e1adeb7fd14c972db9d2bf.zip | |
Rollup merge of #135961 - saethlin:skip-less-in-opt-dist, r=jieyouxu
Fix 2/4 tests skipped by opt-dist The linker errors were because this one test, strangely, wants itself compiled with `-Ctarget-features=+crt-static`, and yet it looks like the runner image is simply missing static libraries for libc and libm. Eyeballing the output of ``` rustc +nightly --target=x86_64-pc-windows-msvc -O tests/codegen/vec-shrink-panik.rs --emit=llvm-ir ``` suggests that vec-shrink-panik should pass on Windows. And it's quite disturbing that such a test would have failed only on Windows to start with. Exactly why that was would require some advanced digging, but it looks clean now.
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 \ |