From eafe31699cc9f1c1baa6107b717fb1df0a32c2e1 Mon Sep 17 00:00:00 2001
From: Amy Huang <akhuang@google.com>
Date: Wed, 2 Jul 2025 10:37:58 -0700
Subject: [PATCH] figure out why fullbuild is failing

---
 .ci/compute_projects.py                    |  2 +-
 .ci/monolithic-linux.sh                    |  8 +++++++-
 .github/workflows/libc-fullbuild-tests.yml | 18 ++++++++++++++----
 .github/workflows/libc-overlay-tests.yml   |  9 +++++++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py
index c3cf714ce6c10..6a9d568cc7b6e 100644
--- a/.ci/compute_projects.py
+++ b/.ci/compute_projects.py
@@ -77,7 +77,7 @@
 DEPENDENT_RUNTIMES_TO_TEST = {
     "clang": {"compiler-rt"},
     "clang-tools-extra": {"libc"},
-    "libc": {"libc"},
+    "libc": {"libc", "compiler-rt"},
     ".ci": {"compiler-rt", "libc"},
 }
 DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 89447963b8528..445ef227c58e5 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -83,7 +83,13 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
       -D LLDB_ENABLE_PYTHON=ON \
       -D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \
-      -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+      -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+      -D LLVM_LIBC_FULL_BUILD=ON \
+      -D LLVM_LIBC_INCLUDE_SCUDO=ON \
+      -D COMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC=ON \
+      -D COMPILER_RT_BUILD_GWP_ASAN=OFF \
+      -D COMPILER_RT_SCUDO_STANDALONE_BUILD_SHARED=OFF
+
 
 echo "--- ninja"
 # Targets are not escaped as they are passed as separate arguments.
diff --git a/.github/workflows/libc-fullbuild-tests.yml b/.github/workflows/libc-fullbuild-tests.yml
index 24d75f58d45e0..16d0cb00ad4ce 100644
--- a/.github/workflows/libc-fullbuild-tests.yml
+++ b/.github/workflows/libc-fullbuild-tests.yml
@@ -15,22 +15,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: [Debug, Release, MinSizeRel]
         include:
           - os: ubuntu-24.04
+            build_type: Debug
             ccache-variant: sccache
             c_compiler: clang-21
             cpp_compiler: clang++-21
             target: x86_64-unknown-linux-llvm
             include_scudo: ON
+          - os: ubuntu-24.04
+            build_type: MinSizeRel
+            ccache-variant: sccache
+            c_compiler: clang-21
+            cpp_compiler: clang++-21
+            target: x86_64-unknown-linux-gnu
+            include_scudo: ON
           # TODO: remove ccache logic when https://github.com/hendrikmuhs/ccache-action/issues/279 is resolved.
           - os: ubuntu-24.04-arm
+            build_type: Debug
             ccache-variant: ccache
             c_compiler: clang-21
             cpp_compiler: clang++-21
-            target: aarch64-unknown-linux-llvm
+            target: aarch64-unknown-linux-gnu
             include_scudo: ON
           - os: ubuntu-24.04
+            build_type: Debug
             ccache-variant: ccache
             c_compiler: clang-21
             cpp_compiler: clang++-21
@@ -77,6 +86,7 @@ jobs:
     
     # Configure libc fullbuild with scudo.
     # Use MinSizeRel to reduce the size of the build.
+
     - name: Configure CMake
       run: |
         export RUNTIMES="libc"
@@ -93,12 +103,12 @@ jobs:
         cmake -B ${{ steps.strings.outputs.build-output-dir }} \
         -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
-        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
         -DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
         -DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
         -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.build-install-dir }} \
-        -DLLVM_RUNTIMES_TARGET=${{ matrix.target }} \
         -DLLVM_ENABLE_RUNTIMES="$RUNTIMES" \
+        -DLLVM_RUNTIMES_TARGET=${{ matrix.target }} \
         -DLLVM_LIBC_FULL_BUILD=ON \
         -G Ninja \
         -S ${{ github.workspace }}/runtimes \
diff --git a/.github/workflows/libc-overlay-tests.yml b/.github/workflows/libc-overlay-tests.yml
index da82d8d9fe8ab..7947a22cf76e8 100644
--- a/.github/workflows/libc-overlay-tests.yml
+++ b/.github/workflows/libc-overlay-tests.yml
@@ -16,7 +16,8 @@ jobs:
       # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations.
       fail-fast: false
       matrix:
-        build_type: [Debug, Release, MinSizeRel]
+        build_type: [Debug]
+        os: [ubuntu-24.04,ubuntu-24.04-arm, windows-2022, windows-2025, macos-14]
         include:
           # TODO: add linux gcc when it is fixed
           - os: ubuntu-24.04
@@ -88,6 +89,10 @@ jobs:
       run: |
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
+    - name: Check clang version
+      run: >
+        clang++ --version
+
     # Use MinSizeRel to reduce the size of the build.
     # Notice that CMP0141=NEW and MSVC_DEBUG_INFORMATION_FORMAT=Embedded are required
     # by the sccache tool.
@@ -110,7 +115,6 @@ jobs:
         cmake 
         --build ${{ steps.strings.outputs.build-output-dir }} 
         --parallel 
-        --config MinSizeRel 
         --target libc
 
     - name: Test
@@ -119,3 +123,4 @@ jobs:
         --build ${{ steps.strings.outputs.build-output-dir }} 
         --parallel 
         --target check-libc
+        -- -v