summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-09-21 22:58:46 +0800
committerruki <[email protected]>2023-09-21 22:58:46 +0800
commit18fe125530192566779c797d0e7006aa5c78c550 (patch)
treea75da9fc0f4a6f21bc83d38aa4ae4bbe18d6e887
parentcffe7e0860e58af6fbc4f0b9338db5f3fad28275 (diff)
improve cargo find_package #4228
-rw-r--r--xmake/modules/package/manager/cargo/find_package.lua8
1 files changed, 7 insertions, 1 deletions
diff --git a/xmake/modules/package/manager/cargo/find_package.lua b/xmake/modules/package/manager/cargo/find_package.lua
index b75182cec..e4873864d 100644
--- a/xmake/modules/package/manager/cargo/find_package.lua
+++ b/xmake/modules/package/manager/cargo/find_package.lua
@@ -134,7 +134,13 @@ function main(name, opt)
local frameworks
local librarydir = path.join(opt.installdir, "lib")
local libfiles = os.files(path.join(librarydir, "*.rlib"))
- for _, libraryfile in ipairs(libfiles) do
+
+ -- @see https://github.com/xmake-io/xmake/issues/4228
+ local libfiles_native
+ if opt.plat == "macosx" then
+ libfiles_native = os.files(path.join(librarydir, "*.dylib"))
+ end
+ for _, libraryfile in ipairs(table.join(libfiles, libfiles_native)) do
local filename = path.filename(libraryfile)
local libraryname = filename:split('-', {plain = true})[1]
if names:has(libraryname) then