averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85872 from edymtt/edymtt/android-build-builtin-float-before-math

Browse Source 
CMake Android: ensure _Builtin_float is built before _math
This commit is contained in:
Eric Miotto
2025-12-09 09:17:22 -08:00
committed by GitHub
parent d97fa92a33 817a890a67
commit 3bbd7da6e7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtimes/Overlay/Android/Math/CMakeLists.txt
View File

@@ -5,7 +5,8 @@ set_target_properties(swift_math PROPERTIES
Swift_MODULE_NAME _math) Swift_MODULE_NAME _math)
target_link_libraries(swift_math PRIVATE target_link_libraries(swift_math PRIVATE
SwiftAndroid SwiftAndroid
swiftCore) swiftCore
swift_Builtin_float)
install(TARGETS swift_math install(TARGETS swift_math
EXPORT SwiftOverlayTargets EXPORT SwiftOverlayTargets

1
stdlib/public/Platform/CMakeLists.txt
View File

@@ -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}" LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
TARGET_SDKS "ANDROID" TARGET_SDKS "ANDROID"
INSTALL_IN_COMPONENT sdk-overlay INSTALL_IN_COMPONENT sdk-overlay
SWIFT_MODULE_DEPENDS_ANDROID _Builtin_float
DEPENDS android_modulemap) DEPENDS android_modulemap)
add_swift_target_library(swiftAndroid ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY add_swift_target_library(swiftAndroid ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY