Fix toolchain path when invoking build_script_helper.py #41739
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
build_script_helper.py hardcodes usr as a path component to the toolchain; pass the correct toolchain path, and remove the hardcoded usr component.
build_script_helper.py hardcodes usr as a path component to the toolchain; pass the correct toolchain path, and remove the hardcoded usr component.
|
@swift-ci build toolchain |
|
@swift-ci test |
finagolfin
reviewed
Mar 9, 2022
| host_target, | ||
| product.build_dir) | ||
| toolchain_path = targets.toolchain_path(install_destdir, | ||
| args.install_prefix) |
There was a problem hiding this comment.
Note the prefix added for Darwin in the next couple lines, that's going to break this usual formulation there, which is why I didn't mess with it last year.
finagolfin
reviewed
Mar 9, 2022
| host_target, | ||
| product.build_dir) | ||
| toolchain_path = targets.toolchain_path(install_destdir, | ||
| args.install_prefix) |
There was a problem hiding this comment.
Try using this better two-line formulation I came up with for other build products, though as above, you will have to do something about that Darwin prefix added below too.
finagolfin
reviewed
Mar 9, 2022
| @@ -49,7 +49,7 @@ def main(): | |||
| if not os.path.isdir(bin_dir): | |||
| os.makedirs(bin_dir) | |||
|
|
|||
| swiftbuild_path = os.path.join(args.toolchain, "usr", "bin", "swift-build") | |||
There was a problem hiding this comment.
Nice, I removed several of these in #30565 and related pulls a couple years ago, but I don't build these products, so it looks like these slipped through.
|
Note to self, need to change the toolchain installation location. |
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.
build_script_helper.pyhardcodes ausrcomponent in the toolchain path it builds, which broke a build with a non-/usrinstall destination.Fix the script invoking
build_script_helper.pyto path a complete toolchain path, and remove the hardcodedusrpath component. The logic to determine the toolchain path was lifted from another script, as this logic is repeated in several location, with slight variations. I picked the variant that seemed the most complete.The first commit is tested in a Linux; the second commit fixes similar code in the vicinity and has not been exercised. It is possible that these changes break on macOS and require some slight tweaking (e.g. the toolchain path given to
build_script_helper.pymight need to includeusras its last path component).