swift_build_support: unify CMake toolchain code #61696
Merged
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 smoke test |
MaxDesiatov
force-pushed
the
maxd/generate-toolchain
branch
from
d541e8c to
c2f7bac
Compare
|
@swift-ci please smoke test |
MaxDesiatov
force-pushed
the
maxd/generate-toolchain
branch
from
c2f7bac to
e7536f5
Compare
|
@swift-ci please smoke test |
edymtt
reviewed
Nov 29, 2022
| @@ -366,6 +380,31 @@ def generate_linux_toolchain_file(self, platform, arch): | |||
|
|
|||
| return toolchain_file | |||
|
|
|||
| def generate_toolchain_file(self, host_target): | |||
There was a problem hiding this comment.
Given the usage in the cmark product, could it make sense to explicitly state that the function targets darwin and linux only? e.g.
Suggested change
| def generate_toolchain_file(self, host_target): | |
| def generate_toolchain_file_for_darwin_and_linux(self, host_target): |
| self.cmake_options.define('CMAKE_CXX_FLAGS', common_c_flags) | ||
|
|
||
| toolchain_file = None | ||
| if self.is_darwin_host(host_target): |
There was a problem hiding this comment.
I like this refactoring, nice catch!
gottesmm
approved these changes
Nov 29, 2022
MaxDesiatov
force-pushed
the
maxd/generate-toolchain
branch
from
e7536f5 to
99dedee
Compare
|
@swift-ci please smoke test |
|
@swift-ci please test Windows |
1 similar comment
|
@swift-ci please test Windows |
|
Verified that this builds successfully in different configurations. |
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.
Currently, a lot of products defined in
utils/swift_build_supportcontain duplicated code that checks for Darwin/Linux triples and generates an appropriate CMake toolchain file. Since all of these products inherit from theProductclass, it makes sense to reduce this code duplication by refactoring it into a single function.