From 394dd834222a0ec4c341e39967ac76f3ca910c5a Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Sun, 17 May 2026 07:53:32 +0100 Subject: [PATCH 1/3] Ensure clang builds with per target times off --- src/bebe/templates/compiler/clang.Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bebe/templates/compiler/clang.Dockerfile b/src/bebe/templates/compiler/clang.Dockerfile index d053847..0d3bc1c 100644 --- a/src/bebe/templates/compiler/clang.Dockerfile +++ b/src/bebe/templates/compiler/clang.Dockerfile @@ -9,7 +9,10 @@ RUN cmake ../llvm \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_ENABLE_PROJECTS="clang;lld" \ -DLLVM_TARGETS_TO_BUILD="X86" \ - -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ + -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \ + -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DCMAKE_INSTALL_PREFIX=/opt/clang-{{ params.compiler.version }} \ -DCMAKE_INSTALL_RPATH="/opt/clang-{{ params.compiler.version }}/lib" \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \ From ec1617e55f1704e8f84ccd7ed6c4378051ed1e20 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Sun, 17 May 2026 09:08:03 +0100 Subject: [PATCH 2/3] Enable runtime project compiler-rt --- src/bebe/templates/compiler/clang.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bebe/templates/compiler/clang.Dockerfile b/src/bebe/templates/compiler/clang.Dockerfile index 0d3bc1c..147a37f 100644 --- a/src/bebe/templates/compiler/clang.Dockerfile +++ b/src/bebe/templates/compiler/clang.Dockerfile @@ -7,9 +7,9 @@ RUN git clone --depth 1 --branch {{ params.compiler.version }} https://github.co WORKDIR /tmp/llvm-project/build RUN cmake ../llvm \ -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_ENABLE_PROJECTS="clang;lld" \ + -DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt" \ -DLLVM_TARGETS_TO_BUILD="X86" \ - -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ From b4b8d6aa8e44ceca3d9606bee11fb7fc0ff24706 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Sun, 17 May 2026 12:31:50 +0100 Subject: [PATCH 3/3] Flatten target tripple headers --- src/bebe/templates/compiler/clang.Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bebe/templates/compiler/clang.Dockerfile b/src/bebe/templates/compiler/clang.Dockerfile index 147a37f..d6e01d8 100644 --- a/src/bebe/templates/compiler/clang.Dockerfile +++ b/src/bebe/templates/compiler/clang.Dockerfile @@ -17,7 +17,10 @@ RUN cmake ../llvm \ -DCMAKE_INSTALL_RPATH="/opt/clang-{{ params.compiler.version }}/lib" \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \ -G "Ninja" && \ - cmake --build . --target install -j"$(nproc)" + cmake --build . --target install -j"$(nproc)" && \ + if [ -d /opt/clang-{{ params.compiler.version }}/include/x86_64-unknown-linux-gnu/c++/v1 ]; then \ + cp -a /opt/clang-{{ params.compiler.version }}/include/x86_64-unknown-linux-gnu/c++/v1/* /opt/clang-{{ params.compiler.version }}/include/c++/v1/ || true; \ + fi WORKDIR / RUN rm -rf /tmp/llvm-project {% endmacro %}