Skip to content

CMake Android: ensure _Builtin_float is built before _math #85872

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.

Sign up for GitHub

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

Open
edymtt wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −1
Open

CMake Android: ensure _Builtin_float is built before _math #85872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Runtimes/Overlay/Android/Math/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ set_target_properties(swift_math PROPERTIES
Swift_MODULE_NAME _math)
target_link_libraries(swift_math PRIVATE
SwiftAndroid
swiftCore)
swiftCore
swift_Builtin_float)

install(TARGETS swift_math
EXPORT SwiftOverlayTargets
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/Platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ add_swift_target_library(swift_math ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_O
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
TARGET_SDKS "ANDROID"
INSTALL_IN_COMPONENT sdk-overlay
SWIFT_MODULE_DEPENDS_ANDROID _Builtin_float
DEPENDS android_modulemap)

add_swift_target_library(swiftAndroid ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
Expand Down