From 08cca5431f4183d54505ce89f2cac4815fdce7b5 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Wed, 29 Jan 2020 16:37:52 -0800
Subject: Move toolchain config into config.lua

---
 ninja.lua | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'ninja.lua')

diff --git a/ninja.lua b/ninja.lua
index 920f7974..79ff3f1b 100644
--- a/ninja.lua
+++ b/ninja.lua
@@ -228,10 +228,16 @@ function sub(name, fn)
 	subninja(name)
 end
 
-function toolchain(name)
-	set('cflags', '$'..name..'_cflags')
-	set('ldflags', '$'..name..'_ldflags')
-	include('$basedir/toolchain/$'..name..'_toolchain.ninja')
+function toolchain(tc)
+	set('ar', tc.ar or (tc.platform and tc.platform..'-ar') or 'ar')
+	set('as', tc.as or (tc.platform and tc.platform..'-as') or 'as')
+	set('cc', tc.cc or (tc.platform and tc.platform..'-cc') or 'cc')
+	set('ld', tc.ld or (tc.platform and tc.platform..'-ld') or 'ld')
+	set('objcopy', tc.objcopy or (tc.platform and tc.platform..'-objcopy') or 'objcopy')
+	set('mc', tc.mc or 'false')
+
+	set('cflags', tc.cflags)
+	set('ldflags', tc.ldflags)
 end
 
 function phony(name, inputs)
-- 
cgit v1.2.3