@@ -163,12 +163,6 @@ set common_cmake_flags=^
163163 -DLLVM_ENABLE_PROJECTS=" clang;clang-tools-extra;lld" ^
164164 -DLLVM_ENABLE_RUNTIMES=" compiler-rt;openmp"
165165
166- set common_lldb_flags = ^
167- -DLLDB_RELOCATABLE_PYTHON=1 ^
168- -DLLDB_EMBED_PYTHON_HOME=OFF ^
169- -DLLDB_ENABLE_LIBXML2=OFF ^
170- -DPYTHON_HOME=%PYTHONHOME%
171-
172166set cmake_profile_flags = " "
173167
174168REM Preserve original path
@@ -244,14 +238,8 @@ exit /b 0
244238set arch = %1
245239set python_dir = %2
246240
247- if " %arch% " == " amd64" (
248- set vs_arch = -arch=amd64
249- ) else (
250- set vs_arch = -arch=arm64
251- )
252-
253241call :set_environment %python_dir% || exit /b 1
254- call " %vsdevcmd% " %vs_arch % || exit /b 1
242+ call " %vsdevcmd% " -arch= %arch % || exit /b 1
255243@ echo on
256244mkdir build_%arch% _stage0
257245cd build_%arch% _stage0
@@ -272,8 +260,6 @@ if "%arch%"=="arm64" (
272260
273261cmake -GNinja %cmake_flags% ^
274262 -DLLVM_TARGETS_TO_BUILD=Native ^
275- -DCMAKE_C_COMPILER=clang-cl.exe ^
276- -DCMAKE_CXX_COMPILER=clang-cl.exe ^
277263 %llvm_src% \llvm || exit /b 1
278264ninja || exit /b 1
279265ninja check-llvm || exit /b 1
@@ -302,11 +288,18 @@ set cmake_flags=%all_cmake_flags:\=/%
302288mkdir build_%arch%
303289cd build_%arch%
304290call :do_generate_profile || exit /b 1
291+
292+ set common_lldb_flags = ^
293+ -DLLDB_RELOCATABLE_PYTHON=1 ^
294+ -DLLDB_EMBED_PYTHON_HOME=OFF ^
295+ -DLLDB_ENABLE_LIBXML2=OFF ^
296+ -DPYTHON_HOME=%PYTHONHOME%
297+
305298cmake -GNinja %cmake_flags% ^
306299 -DLLVM_ENABLE_PROJECTS=" clang;clang-tools-extra;lld;lldb;flang;mlir" ^
307300 %common_lldb_flags% ^
308301 %cmake_profile_flags% %llvm_src% \llvm || exit /b 1
309- ninja || exit /b 1
302+ ninja || ninja || ninja || exit /b 1
310303ninja check-llvm || exit /b 1
311304ninja check-clang || exit /b 1
312305ninja check-lld || exit /b 1
0 commit comments