diff options
| author | ruki <[email protected]> | 2021-03-17 23:00:06 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-03-17 23:00:06 +0800 |
| commit | a9ff0bbb4c6227c53e4dcf1a6a4d1f14aaab0160 (patch) | |
| tree | 3c97e63c3d7083ca7356be1f44bff0a0f9dc48fe /xmake/core/package/package.lua | |
| parent | 24b2a53378c9722010b9fe2f6fba8471269407fb (diff) | |
fix tools/xmake
Diffstat (limited to 'xmake/core/package/package.lua')
| -rw-r--r-- | xmake/core/package/package.lua | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 30949661b..dcca352a6 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -645,12 +645,9 @@ function _instance:build_envs(lazy_loading) setmetatable(build_envs, { __index = function (tbl, key) local value = config.get(key) if value == nil then - value = self:toolconfig(key) - end - if value == nil then value = self:tool(key) end - value = table.unique(table.join(table.wrap(value), self:config(key))) + value = table.unique(table.join(table.wrap(value), table.wrap(self:config(key)), self:toolconfig(key))) if #value > 0 then value = table.unwrap(value) rawset(tbl, key, value) |