Skip to content
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

Fix local CMake build #5032

Merged
merged 1 commit into from
Jul 27, 2024
Merged

Conversation

jmschonfeld
Copy link
Contributor

This updates our CMake files to make it possible to build this project locally via CMake without building the entire toolchain. This required 2 main changes:

  1. When dispatch_DIR is not provided, find dispatch headers from the SDK (looking at DISPATCH_INCLUDE_PATH and falling back to /usr/lib/swift for linux). This mirrors how the SwiftPM build finds dispatch.
  2. Explicitly provide paths to the clang module map files so that the compiler does not encounter ambiguity when the module also exists in the SDK. This mirrors what SwiftPM does today.

@jmschonfeld
Copy link
Contributor Author

@swift-ci please test

@jmschonfeld jmschonfeld merged commit 3a3bf2f into swiftlang:main Jul 27, 2024
2 of 3 checks passed
@jmschonfeld jmschonfeld deleted the fix-local-cmake-build branch July 27, 2024 22:27
jmschonfeld added a commit to jmschonfeld/swift-corelibs-foundation that referenced this pull request Jul 27, 2024
jmschonfeld added a commit that referenced this pull request Jul 29, 2024
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