[build] explicitly set OSX_ARCHITECTURES for targets in stdlib #38415
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. Addresses SR-14035, rdar://80613594
edymtt
requested review from
compnerd,
drexin,
gottesmm,
porglezomp and
shahmishal
|
@swift-ci please test |
|
@swift-ci test Apple Silicon |
compnerd
approved these changes
Jul 16, 2021
|
@swift-ci please test Windows |
|
The preset |
|
The macOS platform tests show that, as a result of this change, the architecture parameter is specified twice and it has the same value (which is a good indicator of what would happen for a build on Apple Silicon without |
|
@swift-ci please test Windows |
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jul 16, 2021
Takes review feedback from swiftlang#38415
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jul 16, 2021
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
added a commit
that referenced
this pull request
Jul 19, 2021
Takes review feedback from #38415
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jan 28, 2022
Previously we were setting `-arch` explicitly and unsetting `CMAKE_OSX_ARCHITECTURES`; however this approach does not work when building on Apple Silicon, since in there CMake 3.19+ enforces a default value (https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5291/diffs), and this would result in the inability to compile code for x86_64. This is a similar approach used for stdlib targets in swiftlang#38415 Addresses rdar://88100025
edymtt
added a commit
that referenced
this pull request
Jan 31, 2022
Previously we were setting `-arch` explicitly and unsetting `CMAKE_OSX_ARCHITECTURES`; however this approach does not work when building on Apple Silicon, since in there CMake 3.19+ enforces a default value (https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5291/diffs), and this would result in the inability to compile code for x86_64. This is a similar approach used for stdlib targets in #38415 Addresses rdar://88100025
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jul 6, 2022
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
hborla
pushed a commit
to hborla/swift
that referenced
this pull request
Jul 21, 2022
…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
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Sep 8, 2022
Rely instead on setting the `OSX_ARCHITECTURES` property (swiftlang#38415) Address rdar://96087734
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Sep 27, 2022
The underlying issue that required restricting to `arm64` has been fixed in swiftlang#38415 Addresses rdar://77191256
edymtt
added a commit
that referenced
this pull request
Sep 28, 2022
The underlying issue that required restricting to `arm64` has been fixed in #38415 Addresses rdar://77191256
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.
Addresses SR-14035, rdar://80613594