Skip to content

Handle swift-sdk search paths #6608

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

Jump to bottom
Merged
merged 1 commit into from
May 26, 2023
Merged

Handle swift-sdk search paths #6608

merged 1 commit into from
May 26, 2023

Conversation

rauhul
Copy link
Member

@rauhul rauhul commented May 23, 2023 •
edited
Loading

  • Fixes 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.

@rauhul rauhul force-pushed the sdk-search-paths branch from 540ddcc to 9955e55 Compare May 23, 2023 23:25
@rauhul
Copy link
Member Author

rauhul commented May 23, 2023

@swift-ci please smoke test

@tomerd
Copy link
Contributor

tomerd commented May 23, 2023

cc @MaxDesiatov

@rauhul
Copy link
Member Author

rauhul commented May 24, 2023

@swift-ci please smoke test windows

@rauhul
Copy link
Member Author

rauhul commented May 24, 2023

@swift-ci please smoke test linux

@rauhul rauhul force-pushed the sdk-search-paths branch from 9955e55 to 8a043da Compare May 24, 2023 23:45
@rauhul
Copy link
Member Author

rauhul commented May 24, 2023

@swift-ci please smoke test

@rauhul
Copy link
Member Author

rauhul commented May 24, 2023

@swift-ci please smoke test windows

@rauhul rauhul enabled auto-merge (squash) May 24, 2023 23:47
@rauhul rauhul force-pushed the sdk-search-paths branch from 8a043da to 07dc10d Compare May 25, 2023 05:42
@rauhul
Copy link
Member Author

rauhul commented May 25, 2023

@swift-ci please smoke test

@rauhul
Copy link
Member Author

rauhul commented May 25, 2023

@swift-ci please smoke test windows

1 similar comment
@rauhul
Copy link
Member Author

rauhul commented May 25, 2023

@swift-ci please smoke test windows

MaxDesiatov
MaxDesiatov approved these changes May 25, 2023
View reviewed changes
Copy link
Contributor

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thanks!

@rauhul
Copy link
Member Author

rauhul commented May 25, 2023

@compnerd it looks like all the windows ci runs are failing with:

C:\Users\swift-ci\jenkins\workspace\swiftpm-PR-windows\swift\test\Distributed\distributed_actor_ban_owned_shared.swift:18:25: error: incorrect message found
  // expected-error@-1{{Copyable types cannot be 'consuming' or 'borrowing' yet}}
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                        copyable types cannot be 'consuming' or 'borrowing' yet

Could you take a look?

@compnerd
Copy link
Member

@rauhul swiftlang/swift#66138

@rauhul
Copy link
Member Author

rauhul commented May 25, 2023

@swift-ci please smoke test windows

1 similar comment
@rauhul
Copy link
Member Author

rauhul commented May 26, 2023

@swift-ci please smoke test windows

@rauhul
Handle swift-sdk search paths
8a00f6c 
- Fixes 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.
@rauhul rauhul force-pushed the sdk-search-paths branch from 07dc10d to 8a00f6c Compare May 26, 2023 06:43
@rauhul
Copy link
Member Author

rauhul commented May 26, 2023

@swift-ci please smoke test

@rauhul
Copy link
Member Author

rauhul commented May 26, 2023

@swift-ci please smoke test windows

@rauhul
Copy link
Member Author

rauhul commented May 26, 2023

@swift-ci please smoke test

@rauhul
Copy link
Member Author

rauhul commented May 26, 2023

@swift-ci please smoke test windows

@rauhul rauhul merged commit 38c5c05 into main May 26, 2023
@rauhul rauhul deleted the sdk-search-paths branch May 26, 2023 16:47
@MaxDesiatov MaxDesiatov mentioned this pull request Jul 21, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaxDesiatov MaxDesiatov MaxDesiatov approved these changes

@neonichu neonichu neonichu approved these changes

@abertelrud abertelrud Awaiting requested review from abertelrud

@tomerd tomerd Awaiting requested review from tomerd

Assignees
No one assigned
Labels
bug cross-compilation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rauhul @tomerd @compnerd @MaxDesiatov @neonichu