Skip to content

Commit 2179453

Browse files
Install GnuWin32.Make and Python packages
1 parent 3f51247 commit 2179453

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

utils/build.ps1

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,6 +1360,16 @@ function Build-Compilers() {
13601360
$env:LIT_XFAIL=$TestsToXFail -join ";"
13611361
$env:LIT_FILTER_OUT="($($TestsToSkip -join '|'))"
13621362

1363+
# Install packages that the test suite requires
1364+
& $python -m pip install psutil
1365+
& $python -m pip install packaging
1366+
1367+
# Install make tool from GunWin32
1368+
$MakeToolPath = "C:/Program Files (x86)/GnuWin32/bin/make.exe"
1369+
if (-not (Test-Path $MakeToolPath)) {
1370+
& winget install GnuWin32.Make
1371+
}
1372+
13631373
$TestingDefines += @{
13641374
LLDB_ENABLE_PYTHON = "YES";
13651375
# Check for required Python modules in CMake
@@ -1368,6 +1378,8 @@ function Build-Compilers() {
13681378
LLVM_ENABLE_PROJECTS = "clang;clang-tools-extra;lld;lldb";
13691379
# No watchpoint support on windows: https://github.com/llvm/llvm-project/issues/24820
13701380
LLDB_TEST_USER_ARGS = "--skip-category=watchpoint";
1381+
# TODO: winget install GnuWin32.Make
1382+
LLDB_TEST_MAKE = $MakeToolPath
13711383
# gtest sharding breaks llvm-lit's --xfail and LIT_XFAIL inputs: https://github.com/llvm/llvm-project/issues/102264
13721384
LLVM_LIT_ARGS = "-v --no-gtest-sharding --show-xfail --show-unsupported";
13731385
# LLDB Unit tests link against this library

0 commit comments

Comments
 (0)