diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-27 06:04:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 06:04:13 +0200 |
| commit | 14669cbb9a36df04f1aa254cd7b363b78195a3c5 (patch) | |
| tree | 3ace950779bd1b9815e6903a20900c5b80c807f0 | |
| parent | c3cd05198a629aa744f8f8a4067f52e710d262ba (diff) | |
| parent | 6c4437e3d25485e657322c7963f79e3b610a7785 (diff) | |
| download | rust-14669cbb9a36df04f1aa254cd7b363b78195a3c5.tar.gz rust-14669cbb9a36df04f1aa254cd7b363b78195a3c5.zip | |
Rollup merge of #114053 - Kobzol:ci-linux-fix-cmake, r=nikic
CI: fix CMake installation for 32/64 bit `dist` Linux Should hopefully fix LLVM 17 build (https://github.com/rust-lang/rust/pull/114048#issuecomment-1649586577).
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile | 3 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile index 59e98689c2c..f5274104d60 100644 --- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile @@ -12,7 +12,6 @@ RUN yum upgrade -y && \ automake \ bzip2 \ file \ - cmake3 \ gcc \ gcc-c++ \ git \ @@ -35,7 +34,7 @@ RUN yum upgrade -y && \ zlib-devel.x86_64 \ && yum clean all -RUN mkdir -p /rustroot/bin && ln -s /usr/bin/cmake3 /rustroot/bin/cmake +RUN mkdir -p /rustroot/bin ENV PATH=/rustroot/bin:$PATH ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib 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 afd536a6602..319989df334 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 @@ -12,7 +12,6 @@ RUN yum upgrade -y && \ automake \ bzip2 \ file \ - cmake3 \ gcc \ gcc-c++ \ git \ @@ -35,7 +34,7 @@ RUN yum upgrade -y && \ zlib-devel.x86_64 \ && yum clean all -RUN mkdir -p /rustroot/bin && ln -s /usr/bin/cmake3 /rustroot/bin/cmake +RUN mkdir -p /rustroot/bin ENV PATH=/rustroot/bin:$PATH ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib |