canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <leah@libreboot.org>
25.04_branch
Leah Rowe 2025-04-23 03:54:08 +01:00
parent 6bd6f14a19
commit f899a3225d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mk
View File

@ -212,7 +212,7 @@ build_targets()
printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target" printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target"
x_ handle_defconfig x_ handle_defconfig
mkhelp "$postmake" x_ $postmake
done; : done; :
} }
@ -439,14 +439,14 @@ handle_makefile()
run_make_command() run_make_command()
{ {
mkhelp "$premake" x_ $premake
$dry check_cmake "$srcdir" && [ -z "$mode" ] && \ $dry check_cmake "$srcdir" && [ -z "$mode" ] && \
$dry check_autoconf "$srcdir" $dry check_autoconf "$srcdir"
$dry check_makefile "$srcdir" || return 1 $dry check_makefile "$srcdir" || return 1
$dry x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs $dry x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
mkhelp "$mkhelper" x_ $mkhelper
[ "$mode" != "clean" ] || \ [ "$mode" != "clean" ] || \
$dry make -C "$srcdir" $cleanargs distclean || :; : $dry make -C "$srcdir" $cleanargs distclean || :; :
@ -475,11 +475,6 @@ check_makefile()
[ -f "$1/GNUmakefile" ] || return 1; : [ -f "$1/GNUmakefile" ] || return 1; :
} }
mkhelp()
{
[ -z "$1" ] || [ -n "$mode" ] || eval "$1" || $err "mkhelp: !$1"; :
}
copy_elf() copy_elf()
{ {
[ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do [ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do