Skip to content

Commit b6fc418

Browse files
authored
bootstrap: fix use of deprecated -Xmanifest flag (#6435)
We should use `-Xbuild-tools-swiftc` instead, as the deprecation warning recommends.
1 parent 048ab95 commit b6fc418

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Sources/swift-bootstrap/main.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct SwiftBootstrapBuildTool: ParsableCommand {
8181
visibility: .hidden))
8282
public var xcbuildFlags: [String] = []
8383

84-
@Option(name: .customLong("Xmanifest", withSingleDash: true),
84+
@Option(name: .customLong("Xbuild-tools-swiftc", withSingleDash: true),
8585
parsing: .unconditionalSingleValue,
8686
help: ArgumentHelp("Pass flag to the manifest build invocation",
8787
visibility: .hidden))

Utilities/bootstrap

+1-1
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ def get_swiftpm_flags(args):
813813

814814
# Ensure we are not sharing the module cache with concurrent builds in CI
815815
local_module_cache_path=os.path.join(args.build_dir, "module-cache")
816-
for modifier in ["-Xswiftc", "-Xmanifest"]:
816+
for modifier in ["-Xswiftc", "-Xbuild-tools-swiftc"]:
817817
build_flags.extend([modifier, "-module-cache-path", modifier, local_module_cache_path])
818818

819819
return build_flags

0 commit comments

Comments
 (0)