summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2026-09-15 21:17:10 +0100
committerLeah Rowe <leah@libreboot.org>2026-09-15 21:17:10 +0100
commitbbc56b714b724d3c1176adc014239a039dfe2e53 (patch)
tree0a39939cd4179587fee6e028052f65b39a0c2aa5
parent6a5b4c98d631a90d81f859afa6b7ad0e67d9aeb0 (diff)
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>
-rwxr-xr-xmk16
1 files changed, 9 insertions, 7 deletions
diff --git a/mk b/mk
index 08e6643a..9c1d8973 100755
--- a/mk
+++ b/mk
@@ -514,9 +514,16 @@ run_make_command()
$if_build \
x_ $premake
- (
+ run_make_command_real || return 1
+
+ $if_build \
+ x_ $mkhelper; :
+}
+
+run_make_command_real()
+{
$if_dry_build \
- exit 0
+ return 0
x_ check_cmake "$srcdir"
@@ -526,11 +533,6 @@ run_make_command()
check_makefile "$srcdir" || return 1
x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
-
- ) || err "run_make_command" "$@"
-
- $if_build \
- x_ $mkhelper; :
}
check_cmake()