[5.4] [Bootstrap] Do not pass -Ddispatch_DIR
to the Yams CMake build (#3363)
#3423
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.
With the version-bump of Yams in swiftlang/swift#36366, Yams
4.0.2
now actually expresses the dependency on Dispatch in its CMake config.With the current behavior of passing
-Ddispatch_DIR
to its CMake build, we have the following problem on Linux:swift
'sbuild-script
installs Dispatch into a just-built toolchain which we use to build SwiftPM, which will contain, among other things, the Dispatch.swiftmodule
.swift-corelibs-libdispatch
also contains a copy of the Dispatch.swiftmodule
.Both of these will be found, leading to build failures like:
We also cannot put off building
libDispatch
until SwiftPM is built, because thelibDispatch
dylib is required to link SwiftPM.Not passing
-Ddispatch_DIR
to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own.(cherry picked from commit 6af862d)
[One line description of your change]
Motivation:
[Explain here the context, and why you're making that change. What is the problem you're trying to solve.]
Modifications:
[Describe the modifications you've done.]
Result:
[After your change, what will change.]