mk: ONLY skip make, if skip-build is set

this solves all remaining problems. defscan is set
reliably now, and real builds are done. configless
builds are skipped, but mkhelpers are still executed.

lbmk should hopefully be stable now. at the very
least, it won't escape your work directory now.

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/mk b/mk
index 7d95656e..036b6714 100755
--- a/mk
+++ b/mk
@@ -307,7 +307,14 @@ handle_buildcfg()
 		$if_build $if_not_dry_build \
 			check_build_environment "$y" || continue
 
-		handle_makefile # also supports non-build operations
+		$if_build \
+			x_ $premake
+
+		$if_not_skip_build \
+			handle_makefile # also supports non-build operations
+
+		$if_build \
+			x_ $mkhelper; :
 
 		$if_build $if_not_dry_build $if_not_skip_build \
 			copy_elf; :
@@ -366,12 +373,8 @@ handle_makefile()
 	[ -f "$buildcfg" ] && \
 		x_ cp "$buildcfg" "$srcdir/$cfgname"
 
-	$if_build \
-		x_ $premake
 	$if_not_skip_build $if_not_dry_build \
 		run_make_command
-	$if_build \
-		x_ $mkhelper; :
 
 	_copy="$cfgname"
 	[ "$mode" = "savedefconfig" ] && \