improve requirekey

2 files changed, 5 insertions, 4 deletions

diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index d5d893658..55085d4f1 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -530,10 +530,8 @@ end
 
 -- get locked package key
 function _get_packagelock_key(requireinfo)
-    local plat        = config.plat() or os.subhost()
-    local arch        = config.arch() or os.subarch()
     local requirestr  = requireinfo.originstr
-    local key         = _get_requirekey(requireinfo, {hash = true, plat = plat, arch = arch})
+    local key         = _get_requirekey(requireinfo, {hash = true})
     return string.format("%s#%s", requirestr, key)
 end
 
@@ -648,7 +646,7 @@ function _load_package(packagename, requireinfo, opt)
         requireinfo.label = splitinfo[2]
     end
 
-    -- sve requirekey
+    -- save requirekey
     local requirekey = _get_packagelock_key(requireinfo)
     requireinfo.requirekey = requirekey
 
diff --git a/xmake/modules/private/action/require/impl/utils/requirekey.lua b/xmake/modules/private/action/require/impl/utils/requirekey.lua
index b07e4d50d..230a53acb 100644
--- a/xmake/modules/private/action/require/impl/utils/requirekey.lua
+++ b/xmake/modules/private/action/require/impl/utils/requirekey.lua
@@ -50,6 +50,9 @@ function main(requireinfo, opt)
         key = key .. ":" .. string.serialize(configs_order, true)
     end
     if opt.hash then
+        if key == "" then
+            key = "_"
+        end
         return hash.uuid(key):gsub("%-", ""):lower()
     else
         return key