Skip to content

Commit 8f301c0

Browse files
committed
fix archlinux
1 parent e2a1099 commit 8f301c0

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

docker/archlinux/Dockerfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
FROM archlinux:latest
22

33
RUN pacman -Syu --noconfirm && \
4-
pacman -S --noconfirm base-devel clang libc++ cmake ninja git vim python3
4+
pacman -S --noconfirm base-devel llvm clang libc++ cmake ninja git vim python3
55

66
ENV CXX=clang++
77
ENV CC=clang
88

9-
RUN git clone --depth=1 https://github.com/llvm/llvm-project && \
9+
RUN CLANG_VERSION=$(clang --version | head -n1 | sed 's/.*version \([0-9.]*\).*/\1/') && \
10+
git clone --depth=1 --branch llvmorg-${CLANG_VERSION} https://github.com/llvm/llvm-project && \
1011
cd llvm-project && \
1112
mkdir build; \
12-
cmake -G Ninja -S runtimes -B build -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DLLVM_USE_SANITIZER=MemoryWithOrigins -DCMAKE_INSTALL_PREFIX=/opt && \
13+
cmake -G Ninja -S runtimes -B build \
14+
-DLLVM_ENABLE_RUNTIMES="libunwind;libcxx;libcxxabi" \
15+
-DLLVM_USE_SANITIZER=MemoryWithOrigins \
16+
-DLIBCXXABI_USE_LLVM_UNWINDER=ON \
17+
-DLIBCXX_CXX_ABI=libcxxabi \
18+
-DLIBCXXABI_LIBCXX_INCLUDES=ON \
19+
-DCMAKE_INSTALL_PREFIX=/opt && \
1320
ninja -C build cxx cxxabi && \
1421
ninja -C build install-cxx install-cxxabi
1522

0 commit comments

Comments
 (0)