mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-09-19 21:20:31 +02:00
fix build error on no-makefile projects
e.g. biosutilities the subshell screws up error handling. this patch changes it to old behaviour. some projects don't have makefiles. the non-zero exit also prevents further call to copy_elf when no binaries are created, as in this example. Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
@@ -514,9 +514,16 @@ run_make_command()
|
|||||||
$if_build \
|
$if_build \
|
||||||
x_ $premake
|
x_ $premake
|
||||||
|
|
||||||
(
|
run_make_command_real || return 1
|
||||||
|
|
||||||
|
$if_build \
|
||||||
|
x_ $mkhelper; :
|
||||||
|
}
|
||||||
|
|
||||||
|
run_make_command_real()
|
||||||
|
{
|
||||||
$if_dry_build \
|
$if_dry_build \
|
||||||
exit 0
|
return 0
|
||||||
|
|
||||||
x_ check_cmake "$srcdir"
|
x_ check_cmake "$srcdir"
|
||||||
|
|
||||||
@@ -526,11 +533,6 @@ run_make_command()
|
|||||||
check_makefile "$srcdir" || return 1
|
check_makefile "$srcdir" || return 1
|
||||||
|
|
||||||
x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
|
x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
|
||||||
|
|
||||||
) || err "run_make_command" "$@"
|
|
||||||
|
|
||||||
$if_build \
|
|
||||||
x_ $mkhelper; :
|
|
||||||
}
|
}
|
||||||
|
|
||||||
check_cmake()
|
check_cmake()
|
||||||
|
|||||||
Reference in New Issue
Block a user