linux-qubasis

commit fbe6143e41ef6657731c11742a0082a82202af6c
parent 9b835b69480d03dd96a326d0a3fd613bfb761b71
Author: Jul <jul@9o.is>
Date:   Sat,  8 Nov 2025 15:36:54 -0500

remove all ninja flushing

Diffstat:
M
gen.sh
 | 
2
--
M
ninja/functions.sh
 | 
45
+++++++++++++++------------------------------

2 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/gen.sh b/gen.sh
@@ -60,5 +60,3 @@ subgen pkg/zstd
 # subgen tpl/example
 # subgen tpl/alpine-template
 # subgen tpl/f42
-
-default build
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -23,7 +23,7 @@ include_ninja() {
 
 default() {
     _ninja_prefix _v $tgtdir $1
-    _ninja_default_target="$_v"
+    printf 'default %s\n' $_v >> "$_ninja_writepath"
 }
 
 rule() {
@@ -344,7 +344,20 @@ _ninja_init() {
 }
 
 _ninja_complete() {
-    _ninja_flush
+	_ninja_run_host
+    _ninja_target deps
+    _ninja_target headers
+	_ninja_target srcs _fetch/srcs
+	_ninja_target build _fetch/build
+
+	_ninja_save configure $ninjadir/$_ninja_file
+	_ninja_target configure
+    gen $ninjadir/$_ninja_file '|' $basedir/config.sh $basedir/ninja/functions.sh $dir/gen.sh
+
+    if [ $_ninja_type == root ]; then
+		default build
+    fi
+
     mv "$_ninja_writepath" "${_ninja_writepath%.*}"
 
     if [ $_ninja_type = root ]; then
@@ -386,7 +399,6 @@ _ninja_initglobals() {
 
     _ninja_buffer_objs=
     _ninja_template=
-    _ninja_default_target=
 }
 
 _ninja_targets_init() {
@@ -542,33 +554,6 @@ _ninja_run_host() {
     fi
 }
 
-_ninja_flush_configure() {
-    if [ ${_ninja_subninja-} ]; then
-        return
-    fi
-
-	_ninja_save configure $ninjadir/$_ninja_file
-	_ninja_target configure
-    gen $ninjadir/$_ninja_file '|' $basedir/config.sh $basedir/ninja/functions.sh $dir/gen.sh
-}
-
-_ninja_flush_default() {
-    if [ ! $_ninja_default_target ]; then
-        return
-    fi
-    printf 'default %s\n' $_ninja_default_target >> "$_ninja_writepath"
-}
-
-_ninja_flush() {
-	_ninja_run_host
-    _ninja_target deps
-    _ninja_target headers
-	_ninja_target srcs _fetch/srcs
-	_ninja_target build _fetch/build
-    _ninja_flush_configure
-    _ninja_flush_default
-}
-
 _ninja_has() {
     _v1=$1; shift