From 003dbc74886944c98f6ed5bd696bee7e7130c348 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 24 Oct 2017 01:28:38 -0700
Subject: Move defaults to config.def.lua

---
 gen.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'gen.lua')

diff --git a/gen.lua b/gen.lua
index bc11b49e..1a9ab56e 100644
--- a/gen.lua
+++ b/gen.lua
@@ -1,20 +1,20 @@
-set('builddir', config.builddir or 'out')
+set('builddir', config.builddir)
 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('target_toolchain', config.target.toolchain)
+set('target_cflags', config.target.cflags)
+set('target_cxxflags', config.target.cxxflags)
+set('target_ldflags', config.target.ldflags)
 
-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('host_toolchain', config.host.toolchain)
+set('host_cflags', config.host.cflags)
+set('host_cxxflags', config.host.cxxflags)
+set('host_ldflags', config.host.ldflags)
 
-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')
+set('repo', config.repo.path)
+set('repo_flags', config.repo.flags)
+set('repo_tag', config.repo.tag)
+set('repo_branch', config.repo.branch)
 
 include 'rules.ninja'
 
-- 
cgit v1.2.3