[llvm] build_llvm_release.bat: Disable clang-tools-extra for stage0 builds (PR #218806)
Tom Stellard via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 26 14:57:38 PDT 2026
https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/218806
>From de2bf8b74268b845e14674b3af19803d2a552bc6 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Tue, 25 Aug 2026 16:07:15 -0700
Subject: [PATCH 1/3] build_llvm_release.bat: Disable clang-tools-extra for
stage0 builds
stage0 just needs to build the minimal toolchain so clang-tools-extra is
not necessary.
---
llvm/utils/release/build_llvm_release.bat | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/llvm/utils/release/build_llvm_release.bat b/llvm/utils/release/build_llvm_release.bat
index f15065970a167..6130b3e7694de 100644
--- a/llvm/utils/release/build_llvm_release.bat
+++ b/llvm/utils/release/build_llvm_release.bat
@@ -185,7 +185,7 @@ set common_cmake_flags=^
-DCMAKE_C_FLAGS="%common_compiler_flags%" ^
-DCMAKE_CXX_FLAGS="%common_compiler_flags%" ^
-DLLVM_ENABLE_RPMALLOC=ON ^
- -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" ^
+ -DLLVM_ENABLE_PROJECTS="clang;lld" ^
-DLLVM_ENABLE_RUNTIMES="compiler-rt;openmp" ^
-DCPACK_GENERATOR="WIX" ^
-DCOMPILER_RT_BUILD_ORC=OFF
@@ -256,7 +256,6 @@ REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
REM ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
REM ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
-REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
cd..
REM CMake expects the paths that specifies the compiler and linker to be
@@ -332,8 +331,6 @@ ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
if "%arch%"=="amd64" (
ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
)
-ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
-ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b 1
cd..
REM CMake expects the paths that specifies the compiler and linker to be
>From 07454802c56f74d6fcfdb1caad1e901ea89c23ef Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 26 Aug 2026 14:56:44 -0700
Subject: [PATCH 2/3] Undo
---
llvm/utils/release/build_llvm_release.bat | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/llvm/utils/release/build_llvm_release.bat b/llvm/utils/release/build_llvm_release.bat
index dd09c49f3f868..952bceacf181b 100644
--- a/llvm/utils/release/build_llvm_release.bat
+++ b/llvm/utils/release/build_llvm_release.bat
@@ -185,7 +185,7 @@ set common_cmake_flags=^
-DCMAKE_C_FLAGS="%common_compiler_flags%" ^
-DCMAKE_CXX_FLAGS="%common_compiler_flags%" ^
-DLLVM_ENABLE_RPMALLOC=ON ^
- -DLLVM_ENABLE_PROJECTS="clang;lld" ^
+ -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" ^
-DLLVM_ENABLE_RUNTIMES="compiler-rt" ^
-DCPACK_GENERATOR="WIX" ^
-DCOMPILER_RT_BUILD_ORC=OFF
@@ -256,6 +256,7 @@ REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
REM ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
REM ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
+REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
cd..
REM CMake expects the paths that specifies the compiler and linker to be
@@ -332,6 +333,8 @@ ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
if "%arch%"=="amd64" (
ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
)
+ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
+ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b 1
cd..
REM CMake expects the paths that specifies the compiler and linker to be
@@ -476,7 +479,7 @@ exit /b 0
mkdir zstdbuild
cd zstdbuild
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install ^
- -DZSTD_BUILD_PROGRAMS=ON -DZSTD_BUILD_TESTS=OFF -DZSTD_BUILD_STATIC=ON ^
+ -DZSTD_BUILD_PROGRAMS=ON -DZSTD_BUILD_TESTS=OFF -DZSTD_BUILD_STATIC=ON ^
-DZSTD_BUILD_SHARED=OFF -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
../../zstd-%zstd_version%/build/cmake || exit /b 1
ninja install || exit /b 1
>From 481b5d157f730ecc7a77a77a5f8fe8ca557cba5b Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Wed, 26 Aug 2026 14:57:01 -0700
Subject: [PATCH 3/3] Re-apply
---
llvm/utils/release/build_llvm_release.bat | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/llvm/utils/release/build_llvm_release.bat b/llvm/utils/release/build_llvm_release.bat
index 952bceacf181b..40d5563a0dd8a 100644
--- a/llvm/utils/release/build_llvm_release.bat
+++ b/llvm/utils/release/build_llvm_release.bat
@@ -185,7 +185,7 @@ set common_cmake_flags=^
-DCMAKE_C_FLAGS="%common_compiler_flags%" ^
-DCMAKE_CXX_FLAGS="%common_compiler_flags%" ^
-DLLVM_ENABLE_RPMALLOC=ON ^
- -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" ^
+ -DLLVM_ENABLE_PROJECTS="clang;lld" ^
-DLLVM_ENABLE_RUNTIMES="compiler-rt" ^
-DCPACK_GENERATOR="WIX" ^
-DCOMPILER_RT_BUILD_ORC=OFF
@@ -256,7 +256,6 @@ REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
REM ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
REM ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
-REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
cd..
REM CMake expects the paths that specifies the compiler and linker to be
@@ -333,8 +332,6 @@ ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
if "%arch%"=="amd64" (
ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
)
-ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
-ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b 1
cd..
REM CMake expects the paths that specifies the compiler and linker to be
More information about the llvm-commits
mailing list