https://github.com/DavidSpickett created https://github.com/llvm/llvm-project/pull/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. >From 45b6a0576255848a8e59780eb102c039a35268b1 Mon Sep 17 00:00:00 2001 From: David Spickett <david.spick...@linaro.org> Date: Fri, 11 Oct 2024 11:05:06 +0000 Subject: [PATCH] [lldb] Fix finding make tool for tests Fixes 0e913237871e8c9290e82be30be8b3484952eee0 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. --- 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 bb17a2ce017d5d..3b8c88b6dc78cb 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 LIBCXX_LIBRARY_DIR diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in index 0e9648a6e6dc83..f20859e87b1e0b 100755 --- a/lldb/utils/lldb-dotest/lldb-dotest.in +++ b/lldb/utils/lldb-dotest/lldb-dotest.in @@ -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@" @@ -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: _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
