From 209bdd63df93be0ff49309f64c647002a159128d Mon Sep 17 00:00:00 2001 From: David Spickett Date: Fri, 11 Oct 2024 14:14:04 +0100 Subject: [PATCH] [lldb] Fix finding make tool for tests (#111980) Fixes 0e913237871e8c9290e82be30be8b3484952eee0 / https://github.com/llvm/llvm-project/pull/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 a2bd5db00d07bc28fcfb3350b9d50e72e6350cba) --- lldb/utils/lldb-dotest/CMakeLists.txt | 1 + lldb/utils/lldb-dotest/lldb-dotest.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index 4980c3521b831..6b30e3c0cbb07 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -34,6 +34,7 @@ set(vars LLDB_TEST_EXECUTABLE LLDB_TEST_COMPILER LLDB_TEST_DSYMUTIL + LLDB_TEST_MAKE LLDB_LIBS_DIR LLVM_TOOLS_DIR LLDB_SWIFTC diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in index 941a98ef5876a..c8b253d70c2b6 100755 --- a/lldb/utils/lldb-dotest/lldb-dotest.in +++ b/lldb/utils/lldb-dotest/lldb-dotest.in @@ -10,6 +10,7 @@ executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@' compiler = '@LLDB_TEST_COMPILER_CONFIGURED@' swift_compiler = '@LLDB_SWIFTC@' 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@" @@ -37,6 +38,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 swift_compiler: