[Windows] Add default dispatch header search path to standalone builds #5033
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
|
@swift-ci please test |
jmschonfeld
changed the title
|
The SwiftPM build still fails because we don't (yet) have a way to find headers for libxml and curl, but this at least gets us a step closer |
compnerd
approved these changes
Jul 26, 2024
|
@swift-ci please test Linux platform |
iCharlesHu
approved these changes
Jul 29, 2024
jmschonfeld
force-pushed
the
windows/package-dispatch-path
branch
from
1bbb017 to
efdbd18
Compare
jmschonfeld
changed the title
|
Updated to make the same change to the CMake file for standalone CMake builds |
|
@swift-ci please test |
|
@swift-ci please test Windows platform |
jmschonfeld
added a commit
to jmschonfeld/swift-corelibs-foundation
that referenced
this pull request
Jul 29, 2024
jmschonfeld
added a commit
that referenced
this pull request
Aug 1, 2024
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.
When building this package via SwiftPM on Windows, we need to include dispatch headers from the appropriate directory in the SDK. We cannot rely on an absolute path such as
/usr/lib/swifton linux, so instead we use a reasonable default based on the SDKROOT environment variable. I believe this environment variable should be set automatically in a VS developer shell with Swift installed to point to theWindows.sdkdirectory within the currently active swift installation. This allows us to find dispatch in many cases and get closer to a working package build on Windows (while still allowing manual overriding via theDISPATCH_INCLUDE_PATHenvironment variable)