From b1ea4165754f04660d3c7282274c4b12355f88a0 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 23 Apr 2025 03:54:08 +0100 Subject: mk: remove mkhelp() and use x_() instead x_ and mkhelp pretty much do the same thing in fact, there is no functional difference Signed-off-by: Leah Rowe --- mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'mk') diff --git a/mk b/mk index 1cdd2fd6..75a91f63 100755 --- a/mk +++ b/mk @@ -213,7 +213,7 @@ build_targets() printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target" x_ handle_defconfig - mkhelp "$postmake" + x_ $postmake done; : } @@ -440,14 +440,14 @@ handle_makefile() run_make_command() { - mkhelp "$premake" + x_ $premake $dry check_cmake "$srcdir" && [ -z "$mode" ] && \ $dry check_autoconf "$srcdir" $dry check_makefile "$srcdir" || return 1 $dry x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs - mkhelp "$mkhelper" + x_ $mkhelper [ "$mode" != "clean" ] || \ $dry make -C "$srcdir" $cleanargs distclean || :; : @@ -476,11 +476,6 @@ check_makefile() [ -f "$1/GNUmakefile" ] || return 1; : } -mkhelp() -{ - [ -z "$1" ] || [ -n "$mode" ] || eval "$1" || $err "mkhelp: !$1"; : -} - copy_elf() { [ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do -- cgit v1.2.1