linux-qubasis

commit 3d04c66276413ddc78b9bd8ae54cb59919bd229c
parent 1663704718d5056d72e09bdd974434ee71473177
Author: Jul <jul@9o.is>
Date:   Sat,  8 Nov 2025 05:02:24 -0500

remove lib and exe buffering

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

1 file changed, 19 insertions(+), 47 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -160,19 +160,34 @@ man() {
 }
 
 exe() {
-    _ninja_flush_exe
     _out=$1; shift
+    _ninja_compile $*
+
+    if [ "$_objs" ] && [ "$_deps" ]; then
+        _rspfile=$outdir/_rsp/${_out##*/}
+
+        awk $_rspfile $_deps '|' $basedir/ninja/rsp.awk
+        bind expr '-f $basedir/ninja/rsp.awk'
+
+        link $_out $_objs $_libs '|' $_rspfile
+        bind ldlibs @$_rspfile
+    elif [ "$_objs" ]; then
+        link $_out $_objs $_libs
+    fi
 
     _ninja_buffer_build="$_ninja_buffer_build $outdir/$_out"
-    _ninja_buffer_exe="$_out $*"
 }
 
 lib() {
-    _ninja_flush_lib
     _out=$1; shift
+    _ninja_compile $*
+
+    if [ "$_objs" ]; then
+        ar $_out $_objs $_libs
+        rsp $_out.d $outdir/$_out $_libs
+    fi
 
     _ninja_buffer_build="$_ninja_buffer_build $outdir/$_out"
-    _ninja_buffer_lib="$_out $*"
 }
 
 dep() {
@@ -333,8 +348,6 @@ _ninja_initglobals() {
 
     _ninja_buffer_subgen=
     _ninja_buffer_objs=
-    _ninja_buffer_exe=
-    _ninja_buffer_lib=
     _ninja_buffer_deps=
     _ninja_buffer_sync=
     _ninja_buffer_fetch=
@@ -478,45 +491,6 @@ _ninja_compile() {
     done
 }
 
-_ninja_flush_exe() {
-    if [ ! "$_ninja_buffer_exe" ]; then
-        return
-    fi
-
-    set -- $_ninja_buffer_exe
-
-    _out=$1; shift
-    _ninja_compile $*
-
-    if [ "$_objs" ] && [ "$_deps" ]; then
-        _rspfile=$outdir/_rsp/${_out##*/}
-
-        awk $_rspfile $_deps '|' $basedir/ninja/rsp.awk
-        bind expr '-f $basedir/ninja/rsp.awk'
-
-        link $_out $_objs $_libs '|' $_rspfile
-        bind ldlibs @$_rspfile
-    elif [ "$_objs" ]; then
-        link $_out $_objs $_libs
-    fi
-}
-
-_ninja_flush_lib() {
-    if [ ! "$_ninja_buffer_lib" ]; then
-        return
-    fi
-
-    set -- $_ninja_buffer_lib
-
-    _out=$1; shift
-    _ninja_compile $*
-
-    if [ "$_objs" ]; then
-        ar $_out $_objs $_libs
-        rsp $_out.d $outdir/$_out $_libs
-    fi
-}
-
 _ninja_flush_subninjas() {
     for _v in $_ninja_buffer_subgen; do
         printf 'subninja $ninjadir/%s.ninja\n' $_v >> "$_ninja_writepath"
@@ -829,8 +803,6 @@ _ninja_flush_default() {
 }
 
 _ninja_flush() {
-    _ninja_flush_lib
-    _ninja_flush_exe
     _ninja_flush_subninjas
     _ninja_flush_deps
     _ninja_flush_headers