Remove -incremental when using -whole-module-optimization (#6728)

keith · web-flow · commit bcb4b1aa8b9e · 2023-07-19T10:14:52.000-07:00
Passing both results in noisy remarks when building from the command line like: ``` remark: Incremental compilation has been disabled: it is not compatible with whole module optimization ``` https://forums.swift.org/t/incremental-compilation-has-been-disabled-it-is-not-compatible-with-whole-module-optimization/66092
diff --git a/Sources/LLBuildManifest/Tools.swift b/Sources/LLBuildManifest/Tools.swift
@@ -316,7 +316,6 @@ public struct SwiftCompilerTool: ToolProtocol {
             }
         }
         arguments += [
-            "-incremental",
             "-emit-dependencies",
             "-emit-module",
             "-emit-module-path", moduleOutputPath.pathString,
@@ -327,6 +326,8 @@ public struct SwiftCompilerTool: ToolProtocol {
         }
         if wholeModuleOptimization {
             arguments += ["-whole-module-optimization", "-num-threads", "\(Self.numThreads)"]
+        } else {
+            arguments += ["-incremental"]
         }
         arguments += ["-c", "@\(self.fileList.pathString)"]
         arguments += ["-I", importPath.pathString]

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,6 @@ public struct SwiftCompilerTool: ToolProtocol {`
`316`	`316`	`}`
`317`	`317`	`}`
`318`	`318`	`arguments += [`
`319`		`- "-incremental",`
`320`	`319`	`"-emit-dependencies",`
`321`	`320`	`"-emit-module",`
`322`	`321`	`"-emit-module-path", moduleOutputPath.pathString,`
`@@ -327,6 +326,8 @@ public struct SwiftCompilerTool: ToolProtocol {`
`327`	`326`	`}`
`328`	`327`	`if wholeModuleOptimization {`
`329`	`328`	`arguments += ["-whole-module-optimization", "-num-threads", "\(Self.numThreads)"]`
	`329`	`+ } else {`
	`330`	`+ arguments += ["-incremental"]`
`330`	`331`	`}`
`331`	`332`	`arguments += ["-c", "@\(self.fileList.pathString)"]`
`332`	`333`	`arguments += ["-I", importPath.pathString]`