Commit 3798f21b authored by Drew's avatar Drew

Remove atllbuild option swiftc-path

This option was deprecated in atbuild 0.9.0.  Use `--toolchain` on the CLI instead.

Users should have had enough time to migrate at this point.
parent 86a5dffb
Pipeline #2186 passed with stage
in 7 minutes and 48 seconds
...@@ -256,7 +256,6 @@ final class ATllbuild : Tool { ...@@ -256,7 +256,6 @@ final class ATllbuild : Tool {
case LinkSDK = "link-sdk" case LinkSDK = "link-sdk"
case LinkWithProduct = "link-with-product" case LinkWithProduct = "link-with-product"
case LinkWithAtbin = "link-with-atbin" case LinkWithAtbin = "link-with-atbin"
case SwiftCPath = "swiftc-path"
case XCTestify = "xctestify" case XCTestify = "xctestify"
case XCTestStrict = "xctest-strict" case XCTestStrict = "xctest-strict"
case IncludeWithUser = "include-with-user" case IncludeWithUser = "include-with-user"
...@@ -282,8 +281,7 @@ final class ATllbuild : Tool { ...@@ -282,8 +281,7 @@ final class ATllbuild : Tool {
LinkOptions, LinkOptions,
LinkSDK, LinkSDK,
LinkWithProduct, LinkWithProduct,
LinkWithAtbin, LinkWithAtbin,
SwiftCPath,
XCTestify, XCTestify,
XCTestStrict, XCTestStrict,
IncludeWithUser, IncludeWithUser,
...@@ -616,15 +614,7 @@ final class ATllbuild : Tool { ...@@ -616,15 +614,7 @@ final class ATllbuild : Tool {
else { else {
llbuildyamlpath = workDirectory.appending("llbuild.yaml") llbuildyamlpath = workDirectory.appending("llbuild.yaml")
} }
let swiftCPath: Path let swiftCPath = findToolPath(toolName: "swiftc", toolchain: toolchain)
if let c = task[Options.SwiftCPath.rawValue]?.string {
print("Warning: \(Options.SwiftCPath.rawValue) is deprecated and will be removed in a future release of atbuild. Use --toolchain to specify a different toolchain, or --platform when bootstrapping to a different platform.")
sleep(5)
swiftCPath = Path(c)
}
else {
swiftCPath = findToolPath(toolName: "swiftc", toolchain: toolchain)
}
let enableWMO: Bool let enableWMO: Bool
if let wmo = task[Options.WholeModuleOptimization.rawValue]?.bool { if let wmo = task[Options.WholeModuleOptimization.rawValue]?.bool {
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
} }
:bootstrap-linux { :bootstrap-linux {
:bootstrap-only true :bootstrap-only true
:swiftc-path "/usr/local/bin/swiftc"
:link-sdk false :link-sdk false
:llbuildyaml "bootstrap/bootstrap-linux.swift-build" :llbuildyaml "bootstrap/bootstrap-linux.swift-build"
} }
...@@ -59,7 +58,6 @@ ...@@ -59,7 +58,6 @@
} }
:bootstrap-linux { :bootstrap-linux {
:bootstrap-only true :bootstrap-only true
:swiftc-path "/usr/local/bin/swiftc"
:link-sdk false :link-sdk false
:llbuildyaml "bootstrap/bootstrap-linux-attools.swift-build" :llbuildyaml "bootstrap/bootstrap-linux-attools.swift-build"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment