Skip to content

Commit eafe316

Browse files
committed
figure out why fullbuild is failing
1 parent 12409a1 commit eafe316

File tree

4 files changed

+29
-8
lines changed

4 files changed

+29
-8
lines changed

.ci/compute_projects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
DEPENDENT_RUNTIMES_TO_TEST = {
7878
"clang": {"compiler-rt"},
7979
"clang-tools-extra": {"libc"},
80-
"libc": {"libc"},
80+
"libc": {"libc", "compiler-rt"},
8181
".ci": {"compiler-rt", "libc"},
8282
}
8383
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {

.ci/monolithic-linux.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,13 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
8383
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
8484
-D LLDB_ENABLE_PYTHON=ON \
8585
-D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \
86-
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
86+
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
87+
-D LLVM_LIBC_FULL_BUILD=ON \
88+
-D LLVM_LIBC_INCLUDE_SCUDO=ON \
89+
-D COMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC=ON \
90+
-D COMPILER_RT_BUILD_GWP_ASAN=OFF \
91+
-D COMPILER_RT_SCUDO_STANDALONE_BUILD_SHARED=OFF
92+
8793

8894
echo "--- ninja"
8995
# Targets are not escaped as they are passed as separate arguments.

.github/workflows/libc-fullbuild-tests.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,31 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
build_type: [Debug, Release, MinSizeRel]
1918
include:
2019
- os: ubuntu-24.04
20+
build_type: Debug
2121
ccache-variant: sccache
2222
c_compiler: clang-21
2323
cpp_compiler: clang++-21
2424
target: x86_64-unknown-linux-llvm
2525
include_scudo: ON
26+
- os: ubuntu-24.04
27+
build_type: MinSizeRel
28+
ccache-variant: sccache
29+
c_compiler: clang-21
30+
cpp_compiler: clang++-21
31+
target: x86_64-unknown-linux-gnu
32+
include_scudo: ON
2633
# TODO: remove ccache logic when https://github.com/hendrikmuhs/ccache-action/issues/279 is resolved.
2734
- os: ubuntu-24.04-arm
35+
build_type: Debug
2836
ccache-variant: ccache
2937
c_compiler: clang-21
3038
cpp_compiler: clang++-21
31-
target: aarch64-unknown-linux-llvm
39+
target: aarch64-unknown-linux-gnu
3240
include_scudo: ON
3341
- os: ubuntu-24.04
42+
build_type: Debug
3443
ccache-variant: ccache
3544
c_compiler: clang-21
3645
cpp_compiler: clang++-21
@@ -77,6 +86,7 @@ jobs:
7786
7887
# Configure libc fullbuild with scudo.
7988
# Use MinSizeRel to reduce the size of the build.
89+
8090
- name: Configure CMake
8191
run: |
8292
export RUNTIMES="libc"
@@ -93,12 +103,12 @@ jobs:
93103
cmake -B ${{ steps.strings.outputs.build-output-dir }} \
94104
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \
95105
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
96-
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
97106
-DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
98107
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
108+
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
99109
-DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.build-install-dir }} \
100-
-DLLVM_RUNTIMES_TARGET=${{ matrix.target }} \
101110
-DLLVM_ENABLE_RUNTIMES="$RUNTIMES" \
111+
-DLLVM_RUNTIMES_TARGET=${{ matrix.target }} \
102112
-DLLVM_LIBC_FULL_BUILD=ON \
103113
-G Ninja \
104114
-S ${{ github.workspace }}/runtimes \

.github/workflows/libc-overlay-tests.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations.
1717
fail-fast: false
1818
matrix:
19-
build_type: [Debug, Release, MinSizeRel]
19+
build_type: [Debug]
20+
os: [ubuntu-24.04,ubuntu-24.04-arm, windows-2022, windows-2025, macos-14]
2021
include:
2122
# TODO: add linux gcc when it is fixed
2223
- os: ubuntu-24.04
@@ -88,6 +89,10 @@ jobs:
8889
run: |
8990
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
9091
92+
- name: Check clang version
93+
run: >
94+
clang++ --version
95+
9196
# Use MinSizeRel to reduce the size of the build.
9297
# Notice that CMP0141=NEW and MSVC_DEBUG_INFORMATION_FORMAT=Embedded are required
9398
# by the sccache tool.
@@ -110,7 +115,6 @@ jobs:
110115
cmake
111116
--build ${{ steps.strings.outputs.build-output-dir }}
112117
--parallel
113-
--config MinSizeRel
114118
--target libc
115119
116120
- name: Test
@@ -119,3 +123,4 @@ jobs:
119123
--build ${{ steps.strings.outputs.build-output-dir }}
120124
--parallel
121125
--target check-libc
126+
-- -v

0 commit comments

Comments
 (0)