From 1e72f6bc9f6779284a694fc63efc961c1c732849 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Mon, 24 Aug 2026 11:21:59 -0700
Subject: [PATCH] build_llvm_release.bat: Remove multiple ninja calls

I think these were here to work around flaky tests, but the tests
consistently pass now.  Also, the script take a lot longer to complete
when there are legitimate failures and it makes debugging problems much
slower.
---
 llvm/utils/release/build_llvm_release.bat | 60 +++++++++++------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/llvm/utils/release/build_llvm_release.bat b/llvm/utils/release/build_llvm_release.bat
index f15065970a167..ec0ac989d953f 100644
--- a/llvm/utils/release/build_llvm_release.bat
+++ b/llvm/utils/release/build_llvm_release.bat
@@ -251,12 +251,12 @@ set cmake_flags=^
   -Dzstd_LIBRARY=%zstddir%/lib/zstd_static.lib
 
 cmake -GNinja %cmake_flags% %llvm_src%\llvm || exit /b 1
-ninja || ninja || ninja || exit /b 1
-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
+ninja || exit /b 1
+REM ninja check-llvm || exit /b 1
+REM ninja check-clang || exit /b 1
+ninja check-lld || exit /b 1
+REM ninja check-runtimes || exit /b 1
+REM ninja check-clang-tools || exit /b 1
 cd..
 
 REM CMake expects the paths that specifies the compiler and linker to be
@@ -276,12 +276,12 @@ set cmake_flags=%all_cmake_flags:\=/%
 mkdir build32
 cd build32
 cmake -GNinja %cmake_flags% %llvm_src%\llvm || exit /b 1
-ninja || ninja || ninja || exit /b 1
-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
+ninja || exit /b 1
+REM ninja check-llvm || exit /b 1
+REM ninja check-clang || exit /b 1
+ninja check-lld || exit /b 1
+REM ninja check-runtimes || exit /b 1
+REM ninja check-clang-tools || exit /b 1
 ninja package || exit /b 1
 cd ..
 
@@ -325,15 +325,15 @@ if "%arch%"=="arm64" (
 cmake -GNinja %cmake_flags% ^
   -DLLVM_TARGETS_TO_BUILD=Native ^
   %llvm_src%\llvm || exit /b 1
-ninja || ninja || ninja || exit /b 1
-ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
-ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
-ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
+ninja || exit /b 1
+ninja check-llvm || exit /b 1
+ninja check-clang || exit /b 1
+ninja check-lld || exit /b 1
 if "%arch%"=="amd64" (
-  ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
+  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
+ninja check-clang-tools || exit /b 1
+ninja check-clangd || exit /b 1
 cd..
 
 REM CMake expects the paths that specifies the compiler and linker to be
@@ -359,18 +359,18 @@ cmake -GNinja %cmake_flags% ^
   %common_lldb_flags% ^
   -DPYTHON_HOME=%PYTHONHOME% ^
   %cmake_profile_flags% %llvm_src%\llvm || exit /b 1
-ninja || ninja || ninja || exit /b 1
-ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
-ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
-ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
+ninja || exit /b 1
+ninja check-llvm || exit /b 1
+ninja check-clang || exit /b 1
+ninja check-lld || exit /b 1
 if "%arch%"=="amd64" (
-  ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
+  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
-REM ninja check-flang || ninja check-flang || ninja check-flang || exit /b 1
-REM ninja check-mlir || ninja check-mlir || ninja check-mlir || exit /b 1
-REM ninja check-lldb || ninja check-lldb || ninja check-lldb || exit /b 1
+ninja check-clang-tools || exit /b 1
+ninja check-clangd || exit /b 1
+REM ninja check-flang || exit /b 1
+REM ninja check-mlir || exit /b 1
+REM ninja check-lldb || exit /b 1
 ninja package || exit /b 1
 
 :: generate tarball with install toolchain only off
@@ -495,7 +495,7 @@ mkdir instrument
 cd instrument
 cmake -GNinja %cmake_flags% -DLLVM_TARGETS_TO_BUILD=Native ^
   -DLLVM_BUILD_INSTRUMENTED=IR %llvm_src%\llvm || exit /b 1
-ninja clang || ninja clang || ninja clang || exit /b 1
+ninja clang || exit /b 1
 set instrumented_clang=%cd:\=/%/bin/clang-cl.exe
 cd ..
 REM Use that to build part of llvm to generate a profile.