Skip to content

Commit 209bdd6

Browse files
DavidSpickettkastiglione
authored andcommitted
[lldb] Fix finding make tool for tests (llvm#111980)
Fixes 0e91323 / llvm#111531 For reasons I can't explain, a clean build works fine for me, and all the bots are working fine. But if I rebuild in some way the make tool becomes None. Looking at the other variables, they had these extra lines so I've added those for make and it seems to solve the problem. (cherry picked from commit a2bd5db)
1 parent d3e466f commit 209bdd6

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

lldb/utils/lldb-dotest/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ set(vars
3434
LLDB_TEST_EXECUTABLE
3535
LLDB_TEST_COMPILER
3636
LLDB_TEST_DSYMUTIL
37+
LLDB_TEST_MAKE
3738
LLDB_LIBS_DIR
3839
LLVM_TOOLS_DIR
3940
LLDB_SWIFTC

lldb/utils/lldb-dotest/lldb-dotest.in

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@'
1010
compiler = '@LLDB_TEST_COMPILER_CONFIGURED@'
1111
swift_compiler = '@LLDB_SWIFTC@'
1212
dsymutil = '@LLDB_TEST_DSYMUTIL_CONFIGURED@'
13+
make = '@LLDB_TEST_MAKE_CONFIGURED@'
1314
lldb_build_dir = '@LLDB_TEST_BUILD_DIRECTORY_CONFIGURED@'
1415
lldb_build_intel_pt = "@LLDB_BUILD_INTEL_PT@"
1516
lldb_framework_dir = "@LLDB_FRAMEWORK_DIR_CONFIGURED@"
@@ -37,6 +38,7 @@ if __name__ == '__main__':
3738
cmd.extend(['--executable', executable])
3839
cmd.extend(['--compiler', compiler])
3940
cmd.extend(['--dsymutil', dsymutil])
41+
cmd.extend(['--make', make])
4042
cmd.extend(['--lldb-libs-dir', lldb_libs_dir])
4143
cmd.extend(['--llvm-tools-dir', llvm_tools_dir])
4244
if swift_compiler:

0 commit comments

Comments
 (0)