Merge pull request #5034 from bitonality/patch-1

Fix incorrect pattern matching for rustc nf_frameworks()
xmake-io · Apr 29, 2024 · f6cd253 · f6cd253
2 parents 719a40b + a5fcb16
commit f6cd253
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xmake/modules/core/tools/rustc.lua b/xmake/modules/core/tools/rustc.lua
@@ -78,7 +78,8 @@ end
 -- make the framework flag, crate module
 function nf_framework(self, framework)
     local basename = path.basename(framework)
-    local cratename = basename:match("lib(.-)%-.-") or basename:match("lib(.-)")
+    -- return "mycrate" from libmycrate-f882feaebb8ba0ca.rlib or libmycrate.rlib
+    local cratename = basename:match("lib(.-)%-.-") or basename:match("lib(.+)")
     if cratename then
         return {"--extern", cratename .. "=" .. framework}
     end