[llvm] [cmake] Serialize native builds for Make generator (PR #121021)

via llvm-commits llvm-commits at lists.llvm.org
Mon Jan 13 23:47:07 PST 2025


================
@@ -2,14 +2,18 @@ include(ExternalProject)
 
 # llvm_ExternalProject_BuildCmd(out_var target)
 #   Utility function for constructing command lines for external project targets
-function(llvm_ExternalProject_BuildCmd out_var target bin_dir)
+function(llvm_ExternalProject_BuildCmd out_var target bin_dir stamp_dir)
   cmake_parse_arguments(ARG "" "CONFIGURATION" "" ${ARGN})
   if(NOT ARG_CONFIGURATION)
     set(ARG_CONFIGURATION "$<CONFIG>")
   endif()
   if (CMAKE_GENERATOR MATCHES "Make")
     # Use special command for Makefiles to support parallelism.
-    set(${out_var} "$(MAKE)" "-C" "${bin_dir}" "${target}" PARENT_SCOPE)
+    set(make_cmd "$(MAKE)" "-C" "${bin_dir}" "${target}")
+    set(file_lock_script "${LLVM_CMAKE_DIR}/FileLock.cmake")
+    set(${out_var} ${CMAKE_COMMAND} "-DLOCK_FILE_PATH=${stamp_dir}/cmake.lock"
+                                    "-DCOMMAND='${make_cmd}'"
----------------
arthurqiu wrote:

@smeenai thanks for reviewing. I've made changes according to your suggestions. Please take a look.

I found that semicolon-separated list just happened to work because `VERBATIM` was not used in `add_custom_command`, even that the build cmd is indeed problematic.

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


More information about the llvm-commits mailing list