linux-qubasis

commit b3ea2c40805f908c714d17cdeadf79cb9c359246
parent 3d04c66276413ddc78b9bd8ae54cb59919bd229c
Author: Jul <jul@9o.is>
Date:   Sat,  8 Nov 2025 05:58:27 -0500

remove ninja_buffer_build

Diffstat:
M
ninja/functions.sh
 | 
48
+++++++++++++++++++++++++++++-------------------

1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -175,7 +175,7 @@ exe() {
         link $_out $_objs $_libs
     fi
 
-    _ninja_buffer_build="$_ninja_buffer_build $outdir/$_out"
+    _ninja_save build $outdir/$_out
 }
 
 lib() {
@@ -187,7 +187,7 @@ lib() {
         rsp $_out.d $outdir/$_out $_libs
     fi
 
-    _ninja_buffer_build="$_ninja_buffer_build $outdir/$_out"
+    _ninja_save build $outdir/$_out
 }
 
 dep() {
@@ -227,7 +227,8 @@ include() {
                 _out=$_src
                 ;;
         esac
-        printf '%s\n' "$_out" >> "$_ninja_headers"
+
+        _ninja_save headers $_out
     done
 }
 
@@ -269,7 +270,6 @@ subgen() {
 maingen() {
     _ninja_init $1
     _ninja_setv_init $1
-    _ninja_targets_init
     . "$_ninja_dir"/gen.sh
     _ninja_complete
 
@@ -301,6 +301,7 @@ _ninja_queue_subgen=
 
 _ninja_init() {
     _ninja_initglobals $1
+    _ninja_targets_init
     mkdir -p "${_ninja_writepath%/*}"
     printf '' > "$_ninja_writepath"
 }
@@ -351,7 +352,6 @@ _ninja_initglobals() {
     _ninja_buffer_deps=
     _ninja_buffer_sync=
     _ninja_buffer_fetch=
-    _ninja_buffer_build=
     _ninja_buffer_fspec=
     _ninja_buffer_fspec_files=
     _ninja_template=
@@ -359,10 +359,27 @@ _ninja_initglobals() {
 }
 
 _ninja_targets_init() {
-    mkdir -p "$_ninja_outdir/_targets"
+    _ninja_tgtsdir="$_ninja_outdir/${_ninja_subninja-}/_targets"
+
+    rm -rf "$_ninja_tgtsdir"
+    mkdir -p "$_ninja_tgtsdir"
+}
 
-    _ninja_headers="$_ninja_outdir/_targets/headers"
-    rm -f $_ninja_headers
+_ninja_save() {
+    _tgt=$1; shift
+    printf '%s\n' "$@" >> "$_ninja_tgtsdir/$_tgt"
+}
+
+_ninja_target() {
+    if ! _ninja_target_has $1; then
+        return
+    fi
+
+    build phony $tgtdir/$1 $(command cat "$_ninja_tgtsdir/$1" | xargs)
+}
+
+_ninja_target_has() {
+    test -e "$_ninja_tgtsdir/$1"
 }
 
 _ninja_setv_init() {
@@ -621,8 +638,9 @@ _ninja_flush_build() {
             build phony $tgtdir/install $_subgens_tpl_install
             ;;
         pkg)
-            if [ "$_ninja_buffer_build" ] || [ "$_subgens" ]; then
-                build phony $tgtdir/build $_ninja_buffer_build $_subgens
+            if _ninja_target_has build || [ "$_subgens" ]; then
+                _ninja_save build $_subgens
+                _ninja_target build
             else
                 touch _fetch/build
                 build phony $tgtdir/build $outdir/_fetch/build
@@ -716,14 +734,6 @@ _ninja_flush_deps() {
     build phony $tgtdir/deps $_ninja_buffer_deps
 }
 
-_ninja_flush_headers() {
-    if [ ! -e "$_ninja_headers" ]; then
-        return
-    fi
-
-    build phony $tgtdir/headers $(command cat "$_ninja_headers" | xargs)
-}
-
 _ninja_flush_fspec() {
     if [ ${_ninja_subninja-} ]; then
         return
@@ -805,7 +815,7 @@ _ninja_flush_default() {
 _ninja_flush() {
     _ninja_flush_subninjas
     _ninja_flush_deps
-    _ninja_flush_headers
+    _ninja_target headers
     _ninja_flush_fspec
     _ninja_flush_fetch
     _ninja_flush_sync