improve incremental compilation fix

xmake-io · Feb 14, 2024 · 45b8fa3 · 45b8fa3
1 parent be329f0
commit 45b8fa3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
@@ -178,7 +178,7 @@ function _get_edges(nodes, modules)
   for _, node in ipairs(nodes) do
       local module = modules[node]
       if module.requires then
-          for required_name, _ in pairs(module.requires) do
+          for required_name, _ in table.orderpairs(module.requires) do
               for _, required_node in ipairs(nodes) do
                   local name, _, _ = compiler_support.get_provided_module(modules[required_node])
                   if name and name == required_name then

diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
@@ -119,7 +119,6 @@ rule("c++.build.modules.builder")
 
                 -- cull external modules objectfile
                 compiler_support.cull_objectfiles(target, modules, sourcebatch)
-                table.sort(sourcebatch.objectfiles)
             else
                 sourcebatch.objectfiles = {}
             end
@@ -183,7 +182,6 @@ rule("c++.build.modules.builder")
 
                 -- cull external modules objectfile
                 compiler_support.cull_objectfiles(target, modules, sourcebatch)
-                table.sort(sourcebatch.objectfiles)
             else
                 -- avoid duplicate linking of object files of non-module programs
                 sourcebatch.objectfiles = {}