diff options
| author | ruki <[email protected]> | 2024-05-09 16:08:42 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-09 16:08:42 +0800 |
| commit | d874b69fea978efc2306c4108a21ce295617683a (patch) | |
| tree | 0b2a8d2be3987aceef1b7e9719aa0f0f337d60eb | |
| parent | 18f302edf15704695f89e4333cc52fd645409d52 (diff) | |
| parent | a5355cb5224e37c9244b1e4ab18ad54a735d4649 (diff) | |
Merge pull request #5076 from xmake-io/tool
fix package tool #5069
| -rw-r--r-- | xmake/core/package/package.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index e673f4345..48c84145b 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1202,7 +1202,8 @@ end -- get the program and name of the given tool kind function _instance:tool(toolkind) if self:toolchains() then - return toolchain.tool(self:toolchains(), toolkind, {cachekey = "package", plat = self:plat(), arch = self:arch()}) + local cachekey = "package_" .. tostring(self) + return toolchain.tool(self:toolchains(), toolkind, {cachekey = cachekey, plat = self:plat(), arch = self:arch()}) else return platform.tool(toolkind, self:plat(), self:arch()) end @@ -1211,7 +1212,8 @@ end -- get tool configuration from the toolchains function _instance:toolconfig(name) if self:toolchains() then - return toolchain.toolconfig(self:toolchains(), name, {cachekey = "package", plat = self:plat(), arch = self:arch()}) + local cachekey = "package_" .. tostring(self) + return toolchain.toolconfig(self:toolchains(), name, {cachekey = cachekey, plat = self:plat(), arch = self:arch()}) else return platform.toolconfig(name, self:plat(), self:arch()) end |