[Lldb-commits] [lldb] [lldb] Add early CMake check for 'make' tool (PR #111531)

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Thu Oct 10 01:35:07 PDT 2024


Stefan =?utf-8?q?Gränitz?= <stefan.graenitz at gmail.com>,
Stefan =?utf-8?q?Gränitz?= <stefan.graenitz at gmail.com>
Message-ID:
In-Reply-To: <llvm.org/llvm/llvm-project/pull/111531 at github.com>


================
@@ -29,6 +29,22 @@ if(LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS)
         "`LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=OFF`")
     endif()
   endforeach()
+
+  # On Windows make is not part of the MSYS tools that llvm-lit takes care of
+  if(LLDB_TEST_MAKE)
+    set(LLDB_DEFAULT_TEST_MAKE ${LLDB_TEST_MAKE})
+  else()
+    find_program(LLDB_DEFAULT_TEST_MAKE make)
+    if(LLDB_DEFAULT_TEST_MAKE)
+      message(STATUS "Found make: ${LLDB_DEFAULT_TEST_MAKE}")
----------------
labath wrote:

How about doing it in the other order? I think it would be somewhat strange if `LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS` actually changed what is being used (instead of just erroring out when detecting errors).

That said, I think that:
- this PR is small enough to do both of those things together
- all that's needed is to do something like `find_program(LLDB_DEFAULT_TEST_MAKE NAMES gmake make)`. `gmake` can exist on non-netbsd systems as well, and it should not be an error to use that (in fact, `make` is a symlink to `gmake` on my system)

https://github.com/llvm/llvm-project/pull/111531


More information about the lldb-commits mailing list