Revert "Revert "swift-lang: shuffle the source directory structure (N… #29941
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
|
CC: @drexin @benlangmuir |
|
@swift-ci please clean test macOS platform |
…FC)"" This reverts commit beb8ecd. Add a workaround for the dependency issue. It is unclear why `sourcekitd` is getting added improperly as a dependency on `lib/sourcekitd.framework/sourcekitd`. This workaround adjusts the dependency such that we end up with a dependency on `lib/sourcekitd.framework/Versions/A/sourcekitd` as an order-only dependency. This should fix the compile issue. I am unable to reproduce this issue with the `add_library` usage for adding a Swift library. This allows us to cleave the host and target libraries, and so the workaround is sufficient to make progress and the problem will be resolved with the migration towards CMake for handling the dependencies.
compnerd
force-pushed
the
it-just-works
branch
from
82ba735 to
200b96d
Compare
|
benlangmuir
approved these changes
Feb 20, 2020
|
@swift-ci please clean test macOS platform |
|
Build failed |
|
@swift-ci please clean test macOS platform |
|
Build failed |
|
Looks like this is causing failures: https://ci.swift.org//job/swift-master-source-compat-suite/4652 |
|
That looks like we're missing the dependency again 😞 The only sourcekitd-related action I see in the log is creating the |
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.
…FC)""
This reverts commit beb8ecd. Add a
workaround for the dependency issue.
It is unclear why
sourcekitdis getting added improperly as adependency on
lib/sourcekitd.framework/sourcekitd. This workaroundadjusts the dependency such that we end up with a dependency on
lib/sourcekitd.framework/Versions/A/sourcekitdas an order-onlydependency. This should fix the compile issue. I am unable to
reproduce this issue with the
add_libraryusage for adding a Swiftlibrary. This allows us to cleave the host and target libraries, and so
the workaround is sufficient to make progress and the problem will be
resolved with the migration towards CMake for handling the dependencies.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.