mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #114053 - Kobzol:ci-linux-fix-cmake, r=nikic

Browse Source 
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).
This commit is contained in:
Matthias Krüger 2023-07-27 06:04:13 +02:00 committed by GitHub
commit 14669cbb9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
View File

@ -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

3
src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View File

@ -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