Re-enable incremental build

build-system/Make/Make.py

@@ -72,16 +72,12 @@ class BazelCommandLine:
         ]
 
         self.common_build_args = [
-            # https://github.com/bazelbuild/rules_swift
-            # If enabled the skip function bodies frontend flag is passed when using derived
-            # files generation.
-            '--features=swift.skip_function_bodies_for_derived_files',
-            
-            # Set the number of parallel processes to match the available CPU core count.
-            '--jobs={}'.format(os.cpu_count()),
         ]
 
+        num_threads = max(os.cpu_count() - 2, 2)
         self.common_debug_args = [
+            '--@build_bazel_rules_swift//swift:copt="-j"',
+            f'--@build_bazel_rules_swift//swift:copt="{num_threads}"',
         ]
 
         self.common_release_args = [

build-system/Make/ProjectGeneration.py

@@ -38,6 +38,7 @@ def generate_xcodeproj(build_environment: BuildEnvironment, disable_extensions,
         project_bazel_arguments += ['--//{}:disableStripping'.format(app_target)]
 
     project_bazel_arguments += ['--features=-swift.debug_prefix_map']
+    project_bazel_arguments += ['--features=swift.emit_swiftsourceinfo']
     
     xcodeproj_bazelrc = os.path.join(build_environment.base_path, 'xcodeproj.bazelrc')
     if os.path.isfile(xcodeproj_bazelrc):