Skip to content

Commit c86b715

Browse files
committed
add rsl conan repo, tweak build script
1 parent 7280f8f commit c86b715

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

base/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
data/usr
2-
**/build
2+
**/build
3+
**/.cache

base/build_clang.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
#!/bin/sh
22
cmake -G Ninja -S clang-p2996/llvm -B build \
3-
-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" \
4-
-DLLVM_ENABLE_RUNTIMES="libunwind;libcxx;libcxxabi" \
3+
-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;" \
4+
-DLLVM_ENABLE_RUNTIMES="libunwind;libcxx;libcxxabi;compiler-rt" \
55
-DCMAKE_BUILD_TYPE=Release \
66
-DLLVM_BUILD_TESTS=OFF \
77
-DCMAKE_INSTALL_PREFIX="data/usr" \
88
-DCMAKE_INSTALL_RPATH="$ORIGIN/../lib;$ORIGIN/../lib64" \
99
-DLLVM_RUNTIME_TARGETS="x86_64-unknown-linux-gnu" \
1010
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
11-
-DCLANG_DEFAULT_CXX_STDLIB=libc++
11+
-DCLANG_DEFAULT_CXX_STDLIB=libc++ \
12+
-DCOMPILER_RT_BUILD_SANITIZERS=ON \
13+
-DCOMPILER_RT_BUILD_PROFILE=ON \
14+
-DCOMPILER_RT_BUILD_LIBFUZZER=ON \
1215

1316
ninja -C build
1417
ninja -C build install

devcontainer/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ FROM ghcr.io/rsl-org/fedora_p2996:latest
33
RUN dnf install -y zsh
44
RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
55
RUN sed -i 's/robbyrussell/eastwood/g' /root/.zshrc
6-
RUN chsh -s /bin/zsh
6+
RUN chsh -s /bin/zsh
7+
8+
RUN git clone https://github.com/rsl-org/conan
9+
RUN conan remote add rsl ./conan

0 commit comments

Comments
 (0)