Skip to content

Commit f6cd253

Browse files
authored
Merge pull request #5034 from bitonality/patch-1
Fix incorrect pattern matching for rustc nf_frameworks()
2 parents 719a40b + a5fcb16 commit f6cd253

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

xmake/modules/core/tools/rustc.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ end
7878
-- make the framework flag, crate module
7979
function nf_framework(self, framework)
8080
local basename = path.basename(framework)
81-
local cratename = basename:match("lib(.-)%-.-") or basename:match("lib(.-)")
81+
-- return "mycrate" from libmycrate-f882feaebb8ba0ca.rlib or libmycrate.rlib
82+
local cratename = basename:match("lib(.-)%-.-") or basename:match("lib(.+)")
8283
if cratename then
8384
return {"--extern", cratename .. "=" .. framework}
8485
end

0 commit comments

Comments
 (0)