Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstrap: fix use of deprecated -Xmanifest flag #6435

Merged
merged 2 commits into from
Apr 18, 2023
Merged

bootstrap: fix use of deprecated -Xmanifest flag #6435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0823e81
bootstrap: fix use of deprecated `-Xmanifest` flag
MaxDesiatov Apr 14, 2023
db8bde0
Update `swift-bootstrap/main.swift`
MaxDesiatov Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/swift-bootstrap/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ struct SwiftBootstrapBuildTool: ParsableCommand {
visibility: .hidden))
public var xcbuildFlags: [String] = []

@Option(name: .customLong("Xmanifest", withSingleDash: true),
@Option(name: .customLong("Xbuild-tools-swiftc", withSingleDash: true),
parsing: .unconditionalSingleValue,
help: ArgumentHelp("Pass flag to the manifest build invocation",
visibility: .hidden))
Expand Down
2 changes: 1 addition & 1 deletion Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ def get_swiftpm_flags(args):

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

return build_flags
Expand Down