[5.5][build] explicitly set OSX_ARCHITECTURES for targets in stdlib #38445
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
Our custom build code already sets the architecture of compilation commands by different means, and so far we were relying on setting `CMAKE_OSX_ARCHITECTURES` to an empty value to avoid CMake doing the same. However, on Apple Silicon, CMake 3.19+ enforces a default value in this scenario (https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5291/diffs), and this would result in the inability to compile code for x86_64. Cherry-pick of swiftlang#38415, swiftlang#38444 Addresses SR-14035, rdar://80699579
edymtt
requested review from
compnerd,
drexin,
gottesmm,
porglezomp and
shahmishal
|
@swift-ci please test |
|
@swift-ci please test Apple Silicon |
|
@swift-ci please build toolchain |
compnerd
approved these changes
Jul 16, 2021
|
Build failed |
|
@swift-ci please test Linux |
|
Linux Toolchain (Ubuntu 16.04) Install command |
tkremenek
approved these changes
Jul 16, 2021
|
macOS Toolchain Install command |
|
👍 👍 |
AnthonyLatsis
added
🍒 release cherry pick
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.
Our custom build code already sets the architecture of compilation
commands by different means, and so far we were relying on setting
CMAKE_OSX_ARCHITECTURESto an empty value to avoid CMake doing thesame.
However, on Apple Silicon, CMake 3.19+ enforces a default value in this
scenario
(https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5291/diffs),
and this would result in the inability to compile code for x86_64.
Cherry-pick of #38415, #38444
Addresses SR-14035, rdar://80699579