From 2dc4a4d16b175f41518142e72f9e1b43a3411274 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 16 Sep 2026 07:35:51 +0100 Subject: [PATCH] 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 --- mk | 16 ++-------------- 1 file 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() { (