diff options
| author | ruki <[email protected]> | 2020-11-05 00:45:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-11-05 00:45:50 +0800 |
| commit | 46a47d31e91c44550bc3feb3d80760b120cad4a2 (patch) | |
| tree | 6b3478ee9ae8752a19cb14661d987e11df47e13d | |
| parent | 5fb5cf85a0f1a25a542596299a11f9dee6d42fe9 (diff) | |
improve package
| -rw-r--r-- | xmake/core/package/package.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/lib/detect/find_tool.lua | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index d1bf52589..463cebebc 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -870,8 +870,8 @@ function _instance:fetch(opt) force = opt.force}) -- may be toolset, not single tool - if not fetchinfo and os.isfile(self:manifest_file()) then - fetchinfo = {name = self:name(), version = self:version_str(), bindir = self:installdir("bin")} + if not fetchinfo then + fetchinfo = self:manifest_load() end if fetchinfo then isSys = self._isSys diff --git a/xmake/modules/lib/detect/find_tool.lua b/xmake/modules/lib/detect/find_tool.lua index 34ad0c20c..f0626c626 100644 --- a/xmake/modules/lib/detect/find_tool.lua +++ b/xmake/modules/lib/detect/find_tool.lua @@ -88,7 +88,5 @@ function main(name, opt) if program and opt.version then version = find_programver(program, opt) end - - -- ok? return {name = toolname, program = program, version = version} end |