@@ -186,8 +186,7 @@ if "%force-msvc%" == "" (
186186set common_lldb_flags = ^
187187 -DLLDB_RELOCATABLE_PYTHON=1 ^
188188 -DLLDB_EMBED_PYTHON_HOME=OFF ^
189- -DLLDB_ENABLE_LIBXML2=OFF ^
190- -DPYTHON_HOME=%PYTHONHOME%
189+ -DLLDB_ENABLE_LIBXML2=OFF
191190
192191set cmake_profile_flags = " "
193192
@@ -235,6 +234,7 @@ set all_cmake_flags=^
235234 %cmake_flags% ^
236235 -DLLVM_ENABLE_PROJECTS=" clang;clang-tools-extra;lld;lldb;" ^
237236 %common_lldb_flags% ^
237+ -DPYTHON_HOME=%PYTHONHOME% ^
238238 -DCMAKE_C_COMPILER=%stage0_bin_dir% /clang-cl.exe ^
239239 -DCMAKE_CXX_COMPILER=%stage0_bin_dir% /clang-cl.exe ^
240240 -DCMAKE_LINKER=%stage0_bin_dir% /lld-link.exe ^
@@ -287,7 +287,7 @@ if "%arch%"=="arm64" (
287287cmake -GNinja %cmake_flags% ^
288288 -DLLVM_TARGETS_TO_BUILD=Native ^
289289 %llvm_src% \llvm || exit /b 1
290- ninja || exit /b 1
290+ ninja || ninja || ninja || exit /b 1
291291ninja check-llvm || exit /b 1
292292ninja check-clang || exit /b 1
293293ninja check-lld || exit /b 1
@@ -314,16 +314,10 @@ set cmake_flags=%all_cmake_flags:\=/%
314314mkdir build_%arch%
315315cd build_%arch%
316316call :do_generate_profile || exit /b 1
317-
318- set common_lldb_flags = ^
319- -DLLDB_RELOCATABLE_PYTHON=1 ^
320- -DLLDB_EMBED_PYTHON_HOME=OFF ^
321- -DLLDB_ENABLE_LIBXML2=OFF ^
322- -DPYTHON_HOME=%PYTHONHOME%
323-
324317cmake -GNinja %cmake_flags% ^
325318 -DLLVM_ENABLE_PROJECTS=" clang;clang-tools-extra;lld;lldb;flang;mlir" ^
326319 %common_lldb_flags% ^
320+ -DPYTHON_HOME=%PYTHONHOME% ^
327321 %cmake_profile_flags% %llvm_src% \llvm || exit /b 1
328322ninja || ninja || ninja || exit /b 1
329323ninja check-llvm || exit /b 1
0 commit comments