[5.4] [Build Script Helper] Do not pass -Ddispatch_DIR to the Yams CMake …
#614
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
…build [Change analagous to: swiftlang/swift-package-manager#3363] 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's build-script installs Dispatch into a just-built toolchain which we use to build swift-driver, which will contain, among other things, the Dispatch .swiftmodule. - The compiler workspace checkout of swift-corelibs-libdispatch also contains a copy of the Dispatch .swiftmodule. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` 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 a76b464)
artemcm
approved these changes
Apr 21, 2021
Not all toolchains assume that we're targeting arm64 on macOS. Building for the host platform only will also match what we do in some other, similar components. Previous behavior of building universal binaries on Darwin is still available using: `--cross-compile-hosts x86_64-apple-macosx10.15 arm64-apple-macosx10.15`
|
@swift-ci test |
|
@swift-ci test |
1 similar comment
|
@swift-ci test |
…leBuild on Apple Silicon (77109455)
|
@swift-ci test |
shahmishal
deleted the
cherry-pick-a76b464108e70336e41632511ede3991f9d633e0
branch
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.
…build
[Change analagous to: https://github.com/swiftlang/swift-package-manager/pull/3363]
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:
Both of these will be found, leading to build failures like:
We also cannot put off building
libDispatchuntil SwiftPM is built, because thelibDispatchdylib is required to link SwiftPM.Not passing
-Ddispatch_DIRto Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own.(cherry picked from commit a76b464)