[5.9] Swift SDKs: fix search paths handling #6740
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
Fixed a bug where `includeSearchPaths` and `librarySearchPaths` defined in a `swift-sdk.json` file were not properly respected. Updates `UserToolchain` to support these by adding matching properties and updates `SwiftTargetBuildDescription` as well as `ClangTargetBuildDescription` to pass these toolchain search paths to the compilers and linkers as expected. (cherry picked from commit 38c5c05) ``` # Conflicts: # Sources/Build/BuildDescription/ClangTargetBuildDescription.swift # Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift ```
MaxDesiatov
requested review from
abertelrud,
neonichu and
tomerd
as code owners
|
@swift-ci smoke test |
|
@swift-ci smoke test macos |
rauhul
approved these changes
Jul 21, 2023
tomerd
approved these changes
Jul 21, 2023
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.
Cherry-pick of #6608.
Fixed a bug where
includeSearchPathsandlibrarySearchPathsdefined in aswift-sdk.jsonfile were not properly respected. UpdatesUserToolchainto support these by adding matching properties and updatesSwiftTargetBuildDescriptionas well asClangTargetBuildDescriptionto pass these toolchain search paths to the compilers and linkers as expected.(cherry picked from commit 38c5c05)