Skip to content

Commit

Permalink
[lldb] Fix finding make tool for tests (llvm#111980)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
DavidSpickett authored and bricknerb committed Oct 17, 2024
1 parent 28599aa commit e38fd07
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions lldb/utils/lldb-dotest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ set(vars
LLDB_TEST_EXECUTABLE
LLDB_TEST_COMPILER
LLDB_TEST_DSYMUTIL
LLDB_TEST_MAKE
LLDB_LIBS_DIR
LLVM_TOOLS_DIR
LIBCXX_LIBRARY_DIR
Expand Down
2 changes: 2 additions & 0 deletions lldb/utils/lldb-dotest/lldb-dotest.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ arch = '@LLDB_TEST_ARCH@'
executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@'
compiler = '@LLDB_TEST_COMPILER_CONFIGURED@'
dsymutil = '@LLDB_TEST_DSYMUTIL_CONFIGURED@'
make = '@LLDB_TEST_MAKE_CONFIGURED@'
lldb_build_dir = '@LLDB_TEST_BUILD_DIRECTORY_CONFIGURED@'
lldb_build_intel_pt = "@LLDB_BUILD_INTEL_PT@"
lldb_framework_dir = "@LLDB_FRAMEWORK_DIR_CONFIGURED@"
Expand All @@ -35,6 +36,7 @@ if __name__ == '__main__':
cmd.extend(['--executable', executable])
cmd.extend(['--compiler', compiler])
cmd.extend(['--dsymutil', dsymutil])
cmd.extend(['--make', make])
cmd.extend(['--lldb-libs-dir', lldb_libs_dir])
cmd.extend(['--llvm-tools-dir', llvm_tools_dir])
if has_libcxx:
Expand Down

0 comments on commit e38fd07

Please sign in to comment.