From 49b02b759fbfbeb862d61045637fcb1e0dbc8853 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 27 May 2025 12:59:42 +0100 Subject: tree.sh: more reliable clean in run_make_command Don't do no-op if it fails; fall back to "clean" instead, and fail if that fails. The no-op was there was not all projects have distclean, but we do intend for them all to be cleaned. We mitigate further error by only running make-clean if a makefile exists. Signed-off-by: Leah Rowe --- include/tree.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/tree.sh b/include/tree.sh index a2d4c378..54de692b 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -292,8 +292,10 @@ run_make_command() $dry x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs [ -n "$mode" ] || x_ $mkhelper + check_makefile "$srcdir" || return 0 [ "$mode" != "clean" ] || \ - $dry make -C "$srcdir" $cleanargs distclean || :; : + $dry make -C "$srcdir" $cleanargs distclean || \ + $dry x_ make -C "$srcdir" $cleanargs clean; : } check_cmake() -- cgit v1.2.1