[6.0] Add swift-corelibs-foundation Linux/Android workaround
#7641
Conversation
This file contains 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
We need this information to set `-w` and other package specific options. (cherry picked from commit c86ea69)
CoreFoundation depends on dispatch, this dependency is implicit and dispatch itself is bundled with swift toolchains. Let's add a package specific workaround for Linux/Android targets to add toolchain resources directory to search paths of clang build targets. (cherry picked from commit 0871a04) # Conflicts: # Sources/Build/BuildDescription/ClangTargetBuildDescription.swift
(cherry picked from commit d6cfaeb) # Conflicts: # Tests/BuildTests/ClangTargetBuildDescriptionTests.swift
(cherry picked from commit a85039c) # Conflicts: # Sources/SPMTestSupport/MockBuildTestHelper.swift
MaxDesiatov
added
linux
build system
|
@swift-ci test |
MaxDesiatov
changed the title
swift-corelibs-foundation Linux/Android-specific workaround
MaxDesiatov
changed the title
swift-corelibs-foundation Linux/Android-specific workaroundswift-corelibs-foundation Linux/Androidworkaround
MaxDesiatov
changed the title
swift-corelibs-foundation Linux/Androidworkaroundswift-corelibs-foundation Linux/Android workaround
MaxDesiatov
added a commit
that referenced
this pull request
Jun 6, 2024
This test should be cherry-picked in #7641 and initially ended up in this cherry-pick PR by mistake.
|
@swift-ci test |
|
@swift-ci test windows |
|
@bnbarham is it worth resolving conflicts here, or are we keeping it in |
|
It turns out that sourcekit-lsp also needs basically this exact thing (https://github.com/apple/sourcekit-lsp/blob/main/CONTRIBUTING.md#linux), so we really do need something more generic here. Let's just keep it on main for now. |
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.
Cherry-pick of #7425
Explanation: CoreFoundation depends on dispatch, this dependency is implicit and dispatch itself is bundled with swift toolchains. Let's add a package specific workaround for Linux/Android targets to add toolchain resources directory to search paths of clang build targets.
Scope: Isolated to Android and Linux support in llbuild code.
Risk: Low, change was on
mainfor more than 2 months now.Testing: Automated with a new test case:
testSwiftCorelibsFoundationIncludeWorkaround.Issue: Prerequisite for rdar://127369576
Reviewer: @MaxDesiatov