From b22465291ce28f752bcb156da735c068ad121c83 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 7 Oct 2020 00:43:18 +0800 Subject: improve builder to support pass toolchain/args --- xmake/core/tool/builder.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmake/core/tool/builder.lua b/xmake/core/tool/builder.lua index fe565a23c..72c8e1932 100644 --- a/xmake/core/tool/builder.lua +++ b/xmake/core/tool/builder.lua @@ -239,9 +239,13 @@ function builder:_add_flags_from_argument(flags, target, args) -- add flags (named) from the language if target then local key = target:type() - self:_add_flags_from_language(flags, target, {[key] = function (name) return args[name] end}) + self:_add_flags_from_language(flags, target, { + [key] = function (name) return args[name] end, + toolchain = function (name) return platform.toolconfig(name) end}) else - self:_add_flags_from_language(flags, nil, {target = function (name) return args[name] end}) + self:_add_flags_from_language(flags, nil, { + target = function (name) return args[name] end, + toolchain = function (name) return platform.toolconfig(name) end}) end end -- cgit v1.3.1