linux-qubasis

commit 242119558bcac27eb383dc4552721a8ac41d984a
parent 1d74d367e5522f35b451a38a0f36b2ca8439a3eb
Author: Jul <jul@9o.is>
Date:   Fri, 22 Aug 2025 18:00:53 +0800

simplify ninja lib inputs to exe

Diffstat:
M
ninja/functions.sh
 | 
5
++---
M
pkg/sbase/gen.sh
 | 
2
+-

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -201,7 +201,7 @@ _ninja_sync() {
 
     for src in $@; do
         case $src in
-            \$srcdir/*.[c1])
+            \$srcdir/*)
                 _ninja_buffer_sync="$_ninja_buffer_sync $src"
         esac
     done
@@ -235,8 +235,7 @@ _ninja_compile() {
                 objs="$objs $obj"
                 ;;
             *.a)
-                obj="\$outdir/${src#\$srcdir/}"
-                objs="$objs $obj"
+                objs="$objs $src"
                 ;;
             *)
                 printf "Error gen $_ninja_file: unknown file to compile: %s\n" "$src"
diff --git a/pkg/sbase/gen.sh b/pkg/sbase/gen.sh
@@ -79,7 +79,7 @@ build getconf '$outdir/headers/getconf.h' '| $srcdir/scripts/getconf.sh'
 
 exes() {
     for src in "$@"; do
-        exe "$src" "$src.c" libutil.a libutf.a
+        exe "$src" "$src.c" '$outdir/libutil.a' '$outdir/libutf.a'
         man "$src.1"
 
         if [ "$src" = 'getconf' ]; then