Skip to content

Commit a2bd5db

Browse files
[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.
1 parent c8554e1 commit a2bd5db

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
LIBCXX_LIBRARY_DIR

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

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ arch = '@LLDB_TEST_ARCH@'
99
executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@'
1010
compiler = '@LLDB_TEST_COMPILER_CONFIGURED@'
1111
dsymutil = '@LLDB_TEST_DSYMUTIL_CONFIGURED@'
12+
make = '@LLDB_TEST_MAKE_CONFIGURED@'
1213
lldb_build_dir = '@LLDB_TEST_BUILD_DIRECTORY_CONFIGURED@'
1314
lldb_build_intel_pt = "@LLDB_BUILD_INTEL_PT@"
1415
lldb_framework_dir = "@LLDB_FRAMEWORK_DIR_CONFIGURED@"
@@ -35,6 +36,7 @@ if __name__ == '__main__':
3536
cmd.extend(['--executable', executable])
3637
cmd.extend(['--compiler', compiler])
3738
cmd.extend(['--dsymutil', dsymutil])
39+
cmd.extend(['--make', make])
3840
cmd.extend(['--lldb-libs-dir', lldb_libs_dir])
3941
cmd.extend(['--llvm-tools-dir', llvm_tools_dir])
4042
if has_libcxx:

0 commit comments

Comments
 (0)