Improve host architecture detection #322
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
compnerd
reviewed
Nov 26, 2017
CMakeLists.txt
Outdated
| set(SWIFT_HOST_ARCH "i686") | ||
| else() | ||
| message(FATAL_ERROR "Unrecognized architecture on host system: ${CMAKE_SYSTEM_PROCESSOR}") | ||
| endif() |
There was a problem hiding this comment.
I think we should extract this into a separate function and put it into a support module incase we need this elsewhere.
There was a problem hiding this comment.
Done, added an additional function to the SwiftSupport.cmake module, since it's related to the architecture naming used by Swift.
uraimo
force-pushed
the
system_arch_fix
branch
from
9e54f5c to
ae5425c
Compare
compnerd
approved these changes
Nov 28, 2017
cmake/modules/SwiftSupport.cmake
Outdated
| # Usage: | ||
| # get_swift_host_arch(result_var_name) | ||
| # | ||
| # If the current architecture is supportedi by Swift, sets ${result_var_name} |
|
please squash the pull request |
|
@swift-ci please test |
uraimo
force-pushed
the
system_arch_fix
branch
from
a22e3bb to
6c14ffc
Compare
|
Squashed. |
|
Gah of course the results of the tests are hidden now. stupid UI |
|
@swift-ci please test |
Merged
ktopley-apple
pushed a commit
that referenced
this pull request
Dec 6, 2018
Improve host architecture detection Signed-off-by: Daniel A. Steffen <[email protected]>
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.
This PR improves host detection to provide the same logic being used in Swift.
Instead of using the specific
${CMAKE_SYSTEM_PROCESSOR}directly, this value should be used to choose a more generic variant.No changes needed for ${SWIFT_OS}.
This PR also fixes an issue on ARM, where at the moment
SWIFT_RUNTIME_LIBDIRpoints to.../armv7l/instead of.../armv7/./cc @compnerd