summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2026-09-16 07:35:51 +0100
committerLeah Rowe <leah@libreboot.org>2026-09-16 07:54:16 +0100
commit2dc4a4d16b175f41518142e72f9e1b43a3411274 (patch)
tree4c41d03d591fc9276c088ff1fcdda4709d0fd318
parentca550770320ef4ce188538331b21587452684c2c (diff)
mk: clean up run_make_command_real
merge check_cmake with run_make_command_real tidied up some redundant checks Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xmk16
1 files changed, 2 insertions, 14 deletions
diff --git a/mk b/mk
index 0cc15ec2..f49d7780 100755
--- a/mk
+++ b/mk
@@ -522,8 +522,8 @@ run_make_command()
run_make_command_real()
{
- $if_not_dry_build
- x_ check_cmake "$srcdir"
+ [ -z "$cmakedir" ] || \
+ x_ cmake -B "$srcdir" "$srcdir/$cmakedir"
$if_build \
check_autoconf "$srcdir"
@@ -533,18 +533,6 @@ run_make_command_real()
x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
}
-check_cmake()
-{
- [ -z "$cmakedir" ] && \
- return 0
-
- check_makefile "$1" || \
- cmake -B "$1" "$1/$cmakedir" || \
- x_ check_makefile "$1"
-
- x_ check_makefile "$1"; :
-}
-
check_autoconf()
{
(