From f3ba2434e68f48db37e3de2a91753016e85508c1 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 14 Apr 2016 23:25:00 -0700
Subject: Move builddir to config.ninja and check-in build.ninja

---
 setup.rc | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

(limited to 'setup.rc')

diff --git a/setup.rc b/setup.rc
index 8a6d6945..4eb0f7ea 100755
--- a/setup.rc
+++ b/setup.rc
@@ -3,27 +3,10 @@
 flag e +
 
 fn usage {
-	{
-		echo 'usage: '$0' [-b builddir]'
-		echo '       '$0' [-n]'
-	} >[1=2]
+	echo 'usage: '$0' [dir]' >[1=2]
 	exit 2
 }
 
-builddir=out
-norecurse=()
-
-while(~ $1 -*) switch($1) {
-case -b
-	builddir=$2
-	shift 2
-case -n
-	norecurse=1
-	shift
-case *
-	usage $0
-}
-
 . ./ninja.rc
 
 fn subgen {
@@ -75,20 +58,5 @@ fn gen {
 
 if(! ~ $#* 0) { gen $1 ; exit }
 
-if(~ $#norecurse 0) {
-	recurse=1
-	@ gen .
-}
-
-{
-	set builddir $builddir
-
-	include config.ninja
-	include rules.ninja
-
-	subninja local.ninja
-
-	build build.ninja gen '|' setup.rc ninja.rc local.ninja
-} >build.ninja.tmp
-
-mv build.ninja.tmp build.ninja
+recurse=1
+@ gen .
-- 
cgit v1.2.3