Skip to content

Rely on autolinking for SQLite on macOS #115

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.

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

Merged
merged 1 commit into from
Aug 20, 2020

Conversation

neonichu
Copy link
Contributor

No description provided.

@neonichu
Copy link
Contributor Author

@swift-ci please test

Copy link
Contributor

@abertelrud abertelrud left a comment

Choose a reason for hiding this comment

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

Looks good to me. In my testing, I didn't actually have to conditionalize the find_package to get it working. I don't know whether not running that on Darwin has problems, e.g. it might be setting up variables that are needed. In my case I just removed the target_link_libraries on Darwin to get it working.

@neonichu
Copy link
Contributor Author

@swift-ci please test

Copy link
Contributor

@abertelrud abertelrud left a comment

Choose a reason for hiding this comment

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

This looks good to me now, and is what got my local build working again, even in the presence of SDKs that have only .tbd files (there might be an underlying CMake issue there as well, if it's assuming .dylib files for SDK libraries). It's conceptually reasonable to use auto link here, I think, since SQLite is an SDK library.

@neonichu neonichu merged commit c76fe6d into swiftlang:master Aug 20, 2020
@neonichu neonichu deleted the optional-sqlite branch August 20, 2020 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants