Merge pull request #773 from compnerd/extract-autolink-extract

compnerd · web-flow · commit dde6b08d219d · 2021-07-29T16:25:50.000-07:00
Jobs: do not inject the swiftautolink file into archives
diff --git a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
@@ -294,7 +294,8 @@ extension GenericUnixToolchain {
       commandLine.appendFlag("crs")
       commandLine.appendPath(outputFile)
 
-      commandLine.append(contentsOf: inputs.map { .path($0.file) })
+      commandLine.append(contentsOf: inputs.filter { $0.type == .object }
+                                           .map { .path($0.file) })
       return try getToolPath(.staticLinker(lto))
     }
 

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,8 @@ extension GenericUnixToolchain {`
`294`	`294`	`commandLine.appendFlag("crs")`
`295`	`295`	`commandLine.appendPath(outputFile)`
`296`	`296`
`297`		`- commandLine.append(contentsOf: inputs.map { .path($0.file) })`
	`297`	`+ commandLine.append(contentsOf: inputs.filter { $0.type == .object }`
	`298`	`+ .map { .path($0.file) })`
`298`	`299`	`return try getToolPath(.staticLinker(lto))`
`299`	`300`	`}`
`300`	`301`