Skip to content

Commit

Permalink
Update CentOS 7 to LLVM/Clang 7 (#324)
Browse files Browse the repository at this point in the history
Note that in `llvm-toolset-7` the 7 refers to the OS version and it had
LLVM 3 and 5. But For some reason for LLVM 7 it is now
`llvm-toolset-7.0`.
  • Loading branch information
bnbarham authored Jan 21, 2023
1 parent f53cb8e commit 95f9297
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions swift-ci/master/centos/7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN yum install --enablerepo=centosplus -y \
libtool \
libuuid-devel \
libxml2-devel \
llvm-toolset-7 \
llvm-toolset-7.0 \
make \
ncurses-devel \
ninja-build \
Expand All @@ -39,7 +39,7 @@ RUN yum install --enablerepo=centosplus -y \
which \
zlib-devel

RUN echo -e ". /opt/rh/sclo-git25/enable\n. /opt/rh/llvm-toolset-7/enable\n. /opt/rh/devtoolset-8/enable\n" >> /home/build-user/.bashrc
RUN echo -e ". /opt/rh/sclo-git25/enable\n. /opt/rh/llvm-toolset-7.0/enable\n. /opt/rh/devtoolset-8/enable\n" >> /home/build-user/.bashrc

RUN sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h

Expand Down

0 comments on commit 95f9297

Please sign in to comment.