Skip to content

Commit

Permalink
Merge rust-lang#69
Browse files Browse the repository at this point in the history
69: Use clang 13 in CI. r=ltratt a=vext01



Co-authored-by: Edd Barrett <vext01@gmail.com>
  • Loading branch information
bors[bot] and vext01 committed May 25, 2023
2 parents eb33453 + 71a7514 commit 4db5152
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .buildbot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ cmake -DCMAKE_INSTALL_PREFIX=${INST_DIR} \
-DLLVM_ENABLE_PROJECTS="lld;clang" \
-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_C_COMPILER=/usr/bin/clang \
-DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
-GNinja \
../llvm
cmake --build .
Expand Down
8 changes: 7 additions & 1 deletion .buildbot_dockerfile_debian
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@ FROM debian:bullseye
ARG CI_UID
RUN useradd -m -u ${CI_UID} ci
RUN apt-get update && \
apt-get -y install build-essential curl cmake python3-distutils git \
apt-get -y install clang-13 make curl cmake python3-distutils git \
ninja-build
WORKDIR /ci
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-13 999
RUN update-alternatives --set cc /usr/bin/clang-13
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-13 999
RUN update-alternatives --set c++ /usr/bin/clang++-13
RUN ln -sf /usr/bin/clang-13 /usr/bin/clang
RUN ln -sf /usr/bin/clang++-13 /usr/bin/clang++
RUN chown ${CI_UID}:${CI_UID} .
COPY --chown=${CI_UID}:${CI_UID} . .
CMD sh -x .buildbot.sh

0 comments on commit 4db5152

Please sign in to comment.