improve to check circular deps

xmake-io · Dec 30, 2022 · d1ef852 · d1ef852
1 parent 784ffcf
commit d1ef852
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
@@ -710,8 +710,10 @@ function _load_package(packagename, requireinfo, opt)
     opt = opt or {}
     if opt.requirepath then
         local splitinfo = opt.requirepath:split(".", {plain = true})
-        if #splitinfo > 1 and splitinfo[1] == splitinfo[#splitinfo] then
-            raise("circular dependency(%s) detected in package(%s)!", opt.requirepath, packagename)
+        if #splitinfo > 3 and
+            splitinfo[1] == splitinfo[#splitinfo - 1] and
+            splitinfo[2] == splitinfo[#splitinfo] then
+            raise("circular dependency(%s) detected in package(%s)!", opt.requirepath, splitinfo[1])
         end
     end