Merge pull request #759 from apple/duck-build

CodaFi · web-flow · commit 3cf63bea5d15 · 2021-07-14T21:25:45.000-07:00
Fixup LLBuild Package Reference in SWIFT_CI Local Build
diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift
@@ -134,16 +134,19 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
         package.dependencies += [
             .package(url: "https://github.com/apple/swift-llbuild.git", .branch("main")),
         ]
+        package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [
+            .product(name: "llbuildSwift", package: "swift-llbuild"),
+        ]
     } else {
         // In Swift CI, use a local path to llbuild to interoperate with tools
         // like `update-checkout`, which control the sources externally.
         package.dependencies += [
-            .package(path: "../llbuild"),
+            .package(name: "llbuild", path: "../llbuild"),
+        ]
+        package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [
+            .product(name: "llbuildSwift", package: "llbuild"),
         ]
     }
-    package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [
-      .product(name: "llbuildSwift", package: "swift-llbuild"),
-    ]
 }
 
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {

Original file line number	Diff line number	Diff line change
`@@ -134,16 +134,19 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {`
`134`	`134`	`package.dependencies += [`
`135`	`135`	`.package(url: "https://github.com/apple/swift-llbuild.git", .branch("main")),`
`136`	`136`	`]`
	`137`	`+ package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [`
	`138`	`+ .product(name: "llbuildSwift", package: "swift-llbuild"),`
	`139`	`+ ]`
`137`	`140`	`} else {`
`138`	`141`	`// In Swift CI, use a local path to llbuild to interoperate with tools`
`139`	`142`	// like `update-checkout`, which control the sources externally.
`140`	`143`	`package.dependencies += [`
`141`		`- .package(path: "../llbuild"),`
	`144`	`+ .package(name: "llbuild", path: "../llbuild"),`
	`145`	`+ ]`
	`146`	`+ package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [`
	`147`	`+ .product(name: "llbuildSwift", package: "llbuild"),`
`142`	`148`	`]`
`143`	`149`	`}`
`144`		`- package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [`
`145`		`- .product(name: "llbuildSwift", package: "swift-llbuild"),`
`146`		`- ]`
`147`	`150`	`}`
`148`	`151`
`149`	`152`	`if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {`