[6.3] CMake Android: ensure _Builtin_float is built before _math #85920
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
_math would be able to build against either the Swift or the clang module for _Builtin_float; however the build will fail if the Swift module is present but does not contain the architectures we need, with errors like ``` <unknown>:0: error: could not find module '_Builtin_float' for target 'armv7-unknown-linux-android'; found: aarch64-unknown-linux-android, x86_64-unknown-linux-android, at: /home/build-user/build/swift-project/Ninja-Release/swift-linux-x86_64/lib/swift/android/_Builtin_float.swiftmodule/armv7-unknown-linux-android ``` In other words, in this situation we are not falling back to the clang module. Addresses rdar://165768601 (cherry picked from commit 817a890)
Contributor
Author
|
@swift-ci please test |
Contributor
Author
|
@swift-ci please build toolchain Windows |
shahmishal
approved these changes
Dec 9, 2025
edymtt
deleted the
edymtt/android-build-builtin-float-before-math-6.3
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Explanation:
Add an explicit dependency on the _Builtin_float overlay to the Android _math overlay -- this will ensure we are always able to build, since this way we will never get in a situation in which the _Builtin_float swiftmodule is present in the build folder but missing the architecture we are targeting (thus preventing to fall back to the _Builtin_float module exposed by Clang)
Scope:
CMake target that generates the _math overlay for Android SDKs -- that is currently used by the Windows toolchain and Android package jobs in CI
Issues:
rdar://165768601
oss-swift-package-swift-sdk-for-android failed: error: could not find module '_Builtin_float' for target 'x86_64-unknown-linux-android' swift-docker#510
Original PRs:
CMake Android: ensure _Builtin_float is built before _math #85872
Risk:
Low
Testing:
Reviewers:
@finagolfin @compnerd