Skip to content

A few fixes for building SwiftPM for MacCatalyst #6414

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
Apr 12, 2023
Merged

A few fixes for building SwiftPM for MacCatalyst #6414

merged 1 commit into from
Apr 12, 2023

Conversation

neonichu
Copy link
Contributor

No description provided.

@neonichu
Copy link
Contributor Author

@swift-ci please smoke test

@neonichu neonichu self-assigned this Apr 12, 2023
@neonichu
Copy link
Contributor Author

@swift-ci please smoke test windows

@neonichu
Copy link
Contributor Author

Windows build is failing:

C:\Users\swift-ci\jenkins\workspace\swiftpm-PR-windows\llvm-project\lldb\source\Plugins\TypeSystem\Swift\SwiftASTContext.cpp(2907): error C2664: 'swift::ASTContext *swift::ASTContext::get(swift::LangOptions &,swift::TypeCheckerOptions &,swift::SILOptions &,swift::SearchPathOptions &,swift::ClangImporterOptions &,swift::symbolgraphgen::SymbolGraphOptions &,swift::SourceManager &,swift::DiagnosticEngine &,llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend>,std::function<bool (llvm::StringRef,bool)>)': cannot convert argument 9 from 'bool (__cdecl *)(llvm::StringRef,bool)' to 'llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend>'

cc @compnerd

MaxDesiatov
MaxDesiatov approved these changes Apr 12, 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.

Thanks!

@MaxDesiatov
Copy link
Contributor

@swift-ci test windows

@neonichu
Copy link
Contributor Author

@tomerd can we force merge this? It is blocking work and I believe we can easily know through code inspection that it won't affect Windows

@tomerd tomerd merged commit 6c99ed5 into main Apr 12, 2023
@neonichu neonichu deleted the fix-catalyst-build branch April 12, 2023 18:00
neonichu added a commit that referenced this pull request Apr 13, 2023
@neonichu
Fix iOS buid
5087581 
Looks like there's an iOS angle to the issue in #6414 as well which I hadn't noticed because I was accidentally building for macOS instead.
@neonichu neonichu mentioned this pull request Apr 13, 2023
Merged
neonichu added a commit that referenced this pull request Apr 13, 2023
@neonichu
Fix iOS buid (#6419)
970f792 
Looks like there's an iOS angle to the issue in #6414 as well which I hadn't noticed because I was accidentally building for macOS instead.
neonichu added a commit that referenced this pull request Apr 13, 2023
@neonichu
Fix iOS buid
29a0c01 
Looks like there's an iOS angle to the issue in #6414 as well which I hadn't noticed because I was accidentally building for macOS instead.

(cherry picked from commit 970f792)
@neonichu neonichu mentioned this pull request Apr 13, 2023
Merged
neonichu added a commit that referenced this pull request Apr 13, 2023
@neonichu
Fix iOS buid (#6423)
a35d251 
Looks like there's an iOS angle to the issue in #6414 as well which I hadn't noticed because I was accidentally building for macOS instead.

(cherry picked from commit 970f792)
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

@abertelrud abertelrud Awaiting requested review from abertelrud

@tomerd tomerd Awaiting requested review from tomerd

Assignees

@neonichu neonichu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@neonichu @MaxDesiatov @tomerd