Remove need for build.ninja and config.ninja

4 files changed, 23 insertions, 25 deletions

diff --git a/build.ninja b/build.ninja
index 7e16e5f9..979b06dd 100644..120000
--- a/build.ninja
+++ b/build.ninja
@@ -1,19 +1 @@
-builddir = out
-
-target_toolchain = x86_64-linux-musl
-target_cflags = -O2 -pipe
-target_cxxflags = $target_cflags
-target_ldflags = -s -static
-
-host_toolchain = default
-host_cflags = -pipe
-host_cxxflags = $host_cflags
-host_ldflags =
-
-repo = $builddir/root.git
-repo_flags = --bare
-repo_tag = tree
-repo_branch = master
-
-include config.ninja
-include local.ninja
+local.ninja
\ No newline at end of file
diff --git a/config.def.ninja b/config.def.ninja
deleted file mode 100644
index f7e57231..00000000
--- a/config.def.ninja
+++ /dev/null
@@ -1 +0,0 @@
-# override anything in build.ninja here
diff --git a/gen.lua b/gen.lua
index c0f851d3..77431aaa 100644
--- a/gen.lua
+++ b/gen.lua
@@ -1,3 +1,21 @@
+set('builddir', config.builddir or 'out')
+set('outdir', '$builddir')
+
+set('target_toolchain', config.target_toolchain or 'x86_64-linux-musl')
+set('target_cflags', config.target_cflags or '-O2 -pipe')
+set('target_cxxflags', config.target_cxxflags or '$target_cflags')
+set('target_ldflags', config.target_ldflags or '-s -static')
+
+set('host_toolchain', config.host_toolchain or 'default')
+set('host_cflags', config.host_cflags or '-pipe')
+set('host_cxxflags', config.host_cxxflags or '$host_cflags')
+set('host_ldflags', config.host_ldflags or '')
+
+set('repo', config.repo or '$builddir/root.git')
+set('repo_flags', config.repo_flags or '--bare')
+set('repo_tag', config.repo_tag or 'tree')
+set('repo_branch', config.repo_branch or 'master')
+
 include 'rules.ninja'
 
 toolchain 'target'
diff --git a/setup.lua b/setup.lua
index 66cbd168..96abb05c 100755
--- a/setup.lua
+++ b/setup.lua
@@ -3,9 +3,6 @@
 if not os.execute('test -f config.lua') then
 	os.execute('cp config.def.lua config.lua')
 end
-if not os.execute('test -f config.ninja') then
-	os.execute('cp config.def.ninja config.ninja')
-end
 
 dofile 'ninja.lua'
 config = dofile 'config.lua'
@@ -51,8 +48,10 @@ function gen(dir)
 	}
 	io.output(dir..'/local.ninja.tmp')
 	set('dir', dir)
-	set('outdir', '$builddir/$dir')
-	set('srcdir', '$dir/src')
+	if dir ~= '.' then
+		set('outdir', '$builddir/$dir')
+		set('srcdir', '$dir/src')
+	end
 	dofile(dir..'/gen.lua')
 
 	build('gen', '$dir/local.ninja', {'|', pkg.inputs.gen})