linux-qubasis
linux oasis port as a qubes template
git clone https://9o.is/git/linux-qubasis.git
commit 63a4299cca8a2ca28abd03fbf60c51f4e4b1a5e6 parent 5a5e0760236ccfb274df759f4b07149046edf30a Author: Jul <jul@9o.is> Date: Sat, 8 Nov 2025 07:17:54 -0500 remove _ninja_buffer_deps Diffstat:
| M | ninja/functions.sh | | | 23 | +++++++++-------------- |
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh @@ -192,7 +192,7 @@ lib() { dep() { _ninja_prefix _srcs $basedir/pkg $* - _ninja_buffer_deps="$_ninja_buffer_deps $_srcs" + _ninja_save deps $_srcs } include() { @@ -349,7 +349,6 @@ _ninja_initglobals() { _ninja_buffer_subgen= _ninja_buffer_objs= - _ninja_buffer_deps= _ninja_buffer_sync= _ninja_buffer_fetch= _ninja_buffer_fspec= @@ -368,17 +367,21 @@ _ninja_targets_init() { _ninja_save() { _tgt=$1; shift - if [ "$@" ]; then + if [ "$*" ]; then printf '%s\n' "$@" >> "$_ninja_tgtsdir/$_tgt" fi } +_ninja_target_exists() { + test -e "$_ninja_tgtsdir/$1" +} + _ninja_target() { _tgt=$1 _empty=${2-} _vs= - if [ -e "$_ninja_tgtsdir/$_tgt" ]; then + if _ninja_target_exists $_tgt; then _vs="$(command cat "$_ninja_tgtsdir/$_tgt" | xargs)" fi @@ -504,7 +507,7 @@ _ninja_compile() { continue fi - if [ "$_ninja_buffer_deps" ]; then + if _ninja_target_exists deps; then _src="$_src || \$tgtdir/deps $_hdrs" elif [ "$_hdrs" ]; then _src="$_src || $_hdrs" @@ -729,14 +732,6 @@ _ninja_flush_sync() { esac } -_ninja_flush_deps() { - if [ ! "$_ninja_buffer_deps" ]; then - return - fi - - build phony $tgtdir/deps $_ninja_buffer_deps -} - _ninja_flush_fspec() { if [ ${_ninja_subninja-} ]; then return @@ -817,7 +812,7 @@ _ninja_flush_default() { _ninja_flush() { _ninja_flush_subninjas - _ninja_flush_deps + _ninja_target deps _ninja_target headers _ninja_flush_fspec _ninja_flush_fetch