Skip to content

Commit bcb3d2f

Browse files
authored
build_llvm_release.bat fixes (#166385)
Some followups after #131687 switched to the "runtimes build". - The `check-sanitizer` build target doesn't exist in the runtimes build; use `check-runtimes` instead. - ASan is not supported on 32-bit windows. Pass `-DCOMPILER_RT_BUILD_SANITIZERS=OFF` - `check-runtimes` includes the orcjit tests, which never passed on windows; build with `-DCOMPILER_RT_BUILD_ORC=OFF` - Various asan and libfuzzer tests fail; suppress them with `LIT_FILTER_OUT`
1 parent 50faea2 commit bcb3d2f

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

llvm/utils/release/build_llvm_release.bat

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
@echo off
2-
setlocal enabledelayedexpansion
32

3+
REM Filter out tests that are known to fail.
4+
set "LIT_FILTER_OUT=gh110231.cpp|crt_initializers.cpp|init-order-atexit.cpp|use_after_return_linkage.cpp|initialization-bug.cpp|initialization-bug-no-global.cpp|trace-malloc-unbalanced.test|trace-malloc-2.test|TraceMallocTest"
5+
6+
setlocal enabledelayedexpansion
47
goto begin
58

69
:usage
@@ -24,6 +27,7 @@ echo.
2427
echo Example: build_llvm_release.bat --version 15.0.0 --x86 --x64
2528
exit /b 1
2629

30+
2731
:begin
2832

2933
::==============================================================================
@@ -163,7 +167,8 @@ set common_cmake_flags=^
163167
-DCMAKE_CXX_FLAGS="%common_compiler_flags%" ^
164168
-DLLVM_ENABLE_RPMALLOC=ON ^
165169
-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" ^
166-
-DLLVM_ENABLE_RUNTIMES="compiler-rt;openmp"
170+
-DLLVM_ENABLE_RUNTIMES="compiler-rt;openmp" ^
171+
-DCOMPILER_RT_BUILD_ORC=OFF
167172

168173
if "%force-msvc%" == "" (
169174
where /q clang-cl
@@ -215,6 +220,7 @@ set "stage0_bin_dir=%build_dir%/build32_stage0/bin"
215220
set cmake_flags=^
216221
%common_cmake_flags% ^
217222
-DLLVM_ENABLE_RPMALLOC=OFF ^
223+
-DCOMPILER_RT_BUILD_SANITIZERS=OFF ^
218224
-DPython3_ROOT_DIR=%PYTHONHOME% ^
219225
-DLIBXML2_INCLUDE_DIR=%libxmldir%/include/libxml2 ^
220226
-DLIBXML2_LIBRARIES=%libxmldir%/lib/libxml2s.lib
@@ -224,7 +230,7 @@ ninja || ninja || ninja || exit /b 1
224230
REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
225231
REM ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
226232
ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
227-
ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b 1
233+
ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
228234
REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
229235
cd..
230236

@@ -233,6 +239,7 @@ REM with forward slash.
233239
set all_cmake_flags=^
234240
%cmake_flags% ^
235241
-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;lldb;" ^
242+
-DCOMPILER_RT_BUILD_SANITIZERS=OFF ^
236243
%common_lldb_flags% ^
237244
-DPYTHON_HOME=%PYTHONHOME% ^
238245
-DCMAKE_C_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
@@ -249,7 +256,7 @@ ninja || ninja || ninja || exit /b 1
249256
REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
250257
REM ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
251258
ninja check-lld || ninja check-lld || ninja check-lld || exit /b 1
252-
ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b 1
259+
ninja check-runtimes || ninja check-runtimes || ninja check-runtimes || exit /b 1
253260
REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
254261
ninja package || exit /b 1
255262
cd ..

0 commit comments

Comments
 (0)