-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[CMake] set OSX_ARCHITECTURES in add_swift_target_library_single
#59922
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CMake] set OSX_ARCHITECTURES in add_swift_target_library_single
#59922
Conversation
This way we configure correctly `libBlocksRuntime`, which is not using `add_swift_target_library` (where the code for setting `OSX_ARCHITECTURES` currently lives, see swiftlang#38415 and swiftlang#38956) Addresses rdar://96469791
@swift-ci please test |
@swift-ci please build toolchain |
preset=stdlib_S_standalone_minimal_macho_x86_64,build,test |
# CMAKE_OSX_ARCHITECTURES to ensure that CMake would | ||
# not add the -arch flag | ||
# This is no longer the case when running on Apple Silicon, | ||
# when CMake will enforce a default (see |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please reflow the text here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Had a stab at this in 29e2b18 -- is this looking better?
@swift-ci please test |
@swift-ci please build toolchain |
preset=stdlib_S_standalone_minimal_macho_x86_64,build,test |
@swift-ci please build toolchain Linux |
Noticed in my first iteration I altered the semantics of the logic in a misguided effort to fit this into the existing conditions -- addressed this with d03731b |
@swift-ci please test |
@swift-ci please build toolchain |
preset=stdlib_S_standalone_minimal_macho_x86_64,build,test |
@swift-ci please test Apple Silicon |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! I can't believe we didn't notice this earlier.
…wiftlang#59922) This way we configure correctly `libBlocksRuntime`, which is not using `add_swift_target_library` (where the code for setting `OSX_ARCHITECTURES` currently lives, see swiftlang#38415 and swiftlang#38956) Addresses rdar://96469791
This way we configure correctly
libBlocksRuntime
, which is not usingadd_swift_target_library
(where the code for settingOSX_ARCHITECTURES
currently lives, see #38415 and #38956)
Addresses rdar://96469791