From cf0ce2e20b65e115353df9e77d6e69ac124218df Mon Sep 17 00:00:00 2001 From: Benson Chu Date: Fri, 15 Aug 2025 15:49:34 -0500 Subject: [PATCH] Sometimes we need make --- lisp/llvm-lib/llvm-shared.el | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/llvm-lib/llvm-shared.el b/lisp/llvm-lib/llvm-shared.el index 29975a3..d0715be 100644 --- a/lisp/llvm-lib/llvm-shared.el +++ b/lisp/llvm-lib/llvm-shared.el @@ -37,11 +37,16 @@ (defvar llvm-core-count (nprocs)) -(defun lls/ninja-build-tools (build-dir tools-list &optional verbose) - (format "set -o pipefail && CLICOLOR_FORCE=1 ninja -C %s -j %d %s %s 2>&1 | tee ninja.log" - build-dir llvm-core-count - (if verbose "-v" "") - (string-join tools-list " "))) +(defun lls/ninja-build-tools (build-dir targets &optional verbose) + (let ((cmake-make-program + (if (string= "Makefile" (car (directory-files build-dir nil "^\\(build\\.ninja$\\|Makefile\\)$"))) + "make" + "ninja"))) + (format "set -o pipefail && CLICOLOR_FORCE=1 %s -C %s -j %d %s %s 2>&1 | tee ninja.log" + cmake-make-program + build-dir llvm-core-count + (if verbose "-v" "") + (string-join targets " ")))) ;; =============================== Init ==============================