diff options
| author | ruki <[email protected]> | 2023-08-09 12:39:44 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-09 12:39:44 +0800 |
| commit | ef2ba39e335136945cec07d04bd5da4bcd1725a8 (patch) | |
| tree | 01b3d47f30fb28371fbd4ff66c5d183d2123b937 /xmake/modules/package/manager/cargo/install_package.lua | |
| parent | d56fd4e78dd1d5a64409df3b8c889a54a4f740eb (diff) | |
| parent | 415f8da47b8b182a7072190dec91061ed6563c88 (diff) | |
Merge pull request #4054 from w568w/rust
Use `cargo metadata` to fetch the name set of cargo libraries
Diffstat (limited to 'xmake/modules/package/manager/cargo/install_package.lua')
| -rw-r--r-- | xmake/modules/package/manager/cargo/install_package.lua | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xmake/modules/package/manager/cargo/install_package.lua b/xmake/modules/package/manager/cargo/install_package.lua index 7d58553e6..9daa665cd 100644 --- a/xmake/modules/package/manager/cargo/install_package.lua +++ b/xmake/modules/package/manager/cargo/install_package.lua @@ -22,6 +22,7 @@ import("core.base.option") import("core.project.config") import("lib.detect.find_tool") +import("private.tools.rust.check_target") -- install package -- @@ -55,11 +56,7 @@ function main(name, opt) -- get target -- e.g. x86_64-pc-windows-msvc, aarch64-unknown-none -- @see https://github.com/xmake-io/xmake/issues/4049 - local target - local arch = opt.arch - if arch and #arch:split("%-") > 1 then - target = arch - end + local target = check_target(opt.arch, true) and opt.arch or nil -- generate Cargo.toml local sourcedir = path.join(opt.cachedir, "source") |