diff options
| author | ruki <[email protected]> | 2023-08-11 00:51:58 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-08-11 00:51:58 +0800 |
| commit | 40f70328407b66a02fb45484ec290703317fa654 (patch) | |
| tree | 79453a2e5de10d8945fd2110d5030ef02ef700a7 | |
| parent | 0768cc5665cd063fbcfdc072b9322894b0d5f34d (diff) | |
update comment
| -rw-r--r-- | xmake/core/project/target.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 6e49bd7d0..efebba746 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -2076,7 +2076,7 @@ function _instance:toolchains() local toolchains = self:_memcache():get("toolchains") if toolchains == nil then - -- load target toolchains + -- load target toolchains first toolchains = {} local target_toolchains = self:get("toolchains") if target_toolchains then @@ -2095,8 +2095,11 @@ function _instance:toolchains() table.insert(toolchains, toolchain_inst) end end - -- load platform toolchains + + -- we need merge target and platform toolchains, + -- because we maybe only set partial toolchains in target, e.g. nasm toolchain table.join2(toolchains, self:platform():toolchains()) + self:_memcache():set("toolchains", toolchains) end return toolchains |
