Merge branch 'dev' of https://github.com/xmake-io/xmake into dev

2 files changed, 9 insertions, 8 deletions

diff --git a/xmake/rules/objc++/precompiled_header/xmake.lua b/xmake/rules/objc++/precompiled_header/xmake.lua
index db2d9f036..9f2b21ade 100644
--- a/xmake/rules/objc++/precompiled_header/xmake.lua
+++ b/xmake/rules/objc++/precompiled_header/xmake.lua
@@ -22,15 +22,16 @@ rule("objc.build.pcheader")
     on_config(function (target, opt)
         import("private.action.build.pcheader").config(target, "m", opt)
     end)
-    before_build(function (target, opt)
-        import("private.action.build.pcheader").build(target, "m", opt)
-    end)
+    before_prepare(function (target, jobgraph, opt)
+        import("private.action.build.pcheader").build(target, jobgraph, "m", opt)
+    end, {jobgraph = true})
 
 rule("objc++.build.pcheader")
+    add_orders("objc++.build.pcheader", "c++.build.modules.builder")
     on_config(function (target, opt)
         import("private.action.build.pcheader").config(target, "mxx", opt)
     end)
-    before_build(function (target, opt)
-        import("private.action.build.pcheader").build(target, "mxx", opt)
-    end)
+    before_prepare(function (target, jobgraph, opt)
+        import("private.action.build.pcheader").build(target, jobgraph, "mxx", opt)
+    end, {jobgraph = true})
 
diff --git a/xmake/rules/objc++/xmake.lua b/xmake/rules/objc++/xmake.lua
index c653261e7..3714ddf3f 100644
--- a/xmake/rules/objc++/xmake.lua
+++ b/xmake/rules/objc++/xmake.lua
@@ -31,7 +31,7 @@ rule("objc.build")
             target:add("frameworks", "Foundation", "CoreFoundation")
         end
     end)
-    on_build_files("private.action.build.object", {batch = true, distcc = true})
+    on_build_files("private.action.build.object", {jobgraph = true, batch = true, distcc = true})
 
 -- define rule: objc++.build
 rule("objc++.build")
@@ -46,7 +46,7 @@ rule("objc++.build")
             target:add("frameworks", "Foundation", "CoreFoundation")
         end
     end)
-    on_build_files("private.action.build.object", {batch = true, distcc = true})
+    on_build_files("private.action.build.object", {jobgraph = true, batch = true, distcc = true})
 
 -- define rule: objc
 rule("objc++")