linux-qubasis

commit a8aa2accd242ed0c502d85feda87b484141998be
parent 26c151aa364e2ec34990000062c79286d5d03b6a
Author: Jul <jul@9o.is>
Date:   Wed, 27 Aug 2025 17:30:32 +0800

simplify configure -- remove ninja configure targets

Diffstat:
M
configure
 | 
2
+-
M
ninja/functions.sh
 | 
10
+++++-----
M
ninja/rules.ninja
 | 
4
++--

3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
@@ -23,4 +23,4 @@ require $TARGET_PLATFORM-ar
 require $TARGET_PLATFORM-as
 require $TARGET_PLATFORM-objcopy
 
-gen "${1:-.}"
+gen .
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -213,14 +213,14 @@ _ninja_init() {
 }
 
 _ninja_complete() {
-    local gen_files='$basedir/config.sh $basedir/ninja/functions.sh $dir/gen.sh'
-
     _ninja_flush
 
-    build phony $tgtdir/configure $ninjadir/$_ninja_file
-    build gen $ninjadir/$_ninja_file '|' $gen_files
+    if [ "$_ninja_type" = 'root' ]; then
+        local gen_files='$basedir/config.sh $basedir/ninja/functions.sh $dir/gen.sh'
+        build gen $ninjadir/$_ninja_file '|' $gen_files
+    fi
 
-    mv $_ninja_writepath ${_ninja_writepath%.*}
+    mv "$_ninja_writepath" "${_ninja_writepath%.*}"
 
     if [ "$_ninja_type" = 'root' ]; then
         ln -sf "$_ninja_ninjadir"/$_ninja_file "$_ninja_basedir"/build.ninja
diff --git a/ninja/rules.ninja b/ninja/rules.ninja
@@ -1,6 +1,6 @@
 rule gen
-  command = sh $basedir/configure $gendir
-  description = CONFIGURE $gendir
+  command = sh $basedir/configure
+  description = CONFIGURE
   generator = 1
 
 rule sync