summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-08-09 11:49:34 +0800
committerGitHub <[email protected]>2023-08-09 11:49:34 +0800
commit415f8da47b8b182a7072190dec91061ed6563c88 (patch)
tree01b3d47f30fb28371fbd4ff66c5d183d2123b937
parentb618dfe97c7bef82a3a317117fc364d0366b2137 (diff)
Update find_package.lua
-rw-r--r--xmake/modules/package/manager/cargo/find_package.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmake/modules/package/manager/cargo/find_package.lua b/xmake/modules/package/manager/cargo/find_package.lua
index 98237adda..58064d9a9 100644
--- a/xmake/modules/package/manager/cargo/find_package.lua
+++ b/xmake/modules/package/manager/cargo/find_package.lua
@@ -84,12 +84,13 @@ function _get_libname(name)
end
-- get the name set of libraries
-function _get_names_of_libraries(name, target, configs)
+function _get_names_of_libraries(name, opt)
+ local configs = opt.configs or {}
local names = hashset.new()
if configs.cargo_toml then
local cargo = assert(find_tool("cargo"), "cargo not found!")
local cargo_args = {"metadata", "--format-version", "1", "--manifest-path", configs.cargo_toml, "--color", "never"}
- local target = check_target(target, true) and target or nil
+ local target = check_target(opt.arch, true) and opt.arch or nil
if target then
table.insert(cargo_args, "--filter-platform")
table.insert(cargo_args, target)
@@ -143,7 +144,7 @@ function main(name, opt)
local configs = opt.configs or {}
-- get names of libraries
- local names = _get_names_of_libraries(name, opt.arch, configs)
+ local names = _get_names_of_libraries(name, opt)
assert(not names:empty())
local frameworkdirs