build-script fix for --extra-swift-args. #23608
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Passing an empty string to this option either as "--extra-swift-args=''" or "--extra-swift-args ''" would cause build-script-impl to fail to parse some arbitrary number of other options. This is impossible to debug from the build log because all of the build-script-impl options still show up in the log. So, cutting and pasting the build-script-impl command actually works. Turns out this is why build-script build and install stages never worked for me, beyond running cmake.
|
@Rostepher please review. |
|
@swift-ci test. |
|
@swift-ci Please Build Toolchain |
Rostepher
reviewed
Mar 27, 2019
| @@ -763,8 +763,8 @@ class BuildScriptInvocation(object): | |||
| # add them as one command. | |||
| if args.extra_swift_args: | |||
| impl_args += [ | |||
| "--extra-swift-args", | |||
| ";".join(args.extra_swift_args)] | |||
| "--extra-swift-args=%s" % ';'.join(args.extra_swift_args) | |||
There was a problem hiding this comment.
We should probably use the more modern .format() in this case, but it's not entirely necessary as the rest of the file doesn't.
Rostepher
approved these changes
Mar 27, 2019
|
Linux Toolchain (Ubuntu 16.04) Install command |
|
macOS Toolchain Install command |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Passing an empty string to this option either as
"--extra-swift-args=''" or "--extra-swift-args ''" would cause
build-script-impl to fail to parse some arbitrary number of other
options.
This is impossible to debug from the build log because all of the
build-script-impl options still show up in the log. So, cutting and
pasting the build-script-impl command actually works.
Turns out this is why build-script build and install stages never
worked for me, beyond running cmake.