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

[android] Allow BlocksRuntimeStub to compile for Android

Browse Source 
The target was correctly set for compiling, but was missing for linking,
so the Android was trying to be link against the host tools machine.

The solution uses _add_swift_library_single from AddSwift.cmake, which should handle all the
supported SDK/Archs.
This commit is contained in:
Daniel Rodríguez Troitiño
2019-04-02 17:54:36 -07:00
parent 473f3d2539
commit ea902561c6
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/modules/AddSwift.cmake
View File

@@ -467,12 +467,14 @@ function(_add_variant_link_flags)
endif() endif()
if(NOT "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_UC}" STREQUAL "") if(NOT "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_UC}" STREQUAL "")
get_filename_component(SWIFT_${sdk}_${arch}_ICU_UC_LIBDIR "${SWIFT_${sdk}_${arch}_ICU_UC}" DIRECTORY) get_filename_component(SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_UC_LIBDIR
list(APPEND library_search_directories "${SWIFT_${sdk}_${arch}_ICU_UC_LIBDIR}") "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_UC}" DIRECTORY)
list(APPEND library_search_directories "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_UC_LIBDIR}")
endif() endif()
if(NOT "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_I18N}" STREQUAL "") if(NOT "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_I18N}" STREQUAL "")
get_filename_component(SWIFT_${sdk}_${arch}_ICU_I18N_LIBDIR "${SWIFT_${sdk}_${arch}_ICU_I18N}" DIRECTORY) get_filename_component(SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_I18N_LIBDIR
list(APPEND library_search_directories "${SWIFT_${sdk}_${arch}_ICU_I18N_LIBDIR}") "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_I18N}" DIRECTORY)
list(APPEND library_search_directories "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_I18N_LIBDIR}")
endif() endif()
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE) if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)

15
test/CMakeLists.txt
View File

@@ -204,13 +204,16 @@ foreach(SDK ${SWIFT_SDKS})
__declspec(dllexport) __declspec(dllexport)
#endif #endif
_Block_release(void) { }\n") _Block_release(void) { }\n")
add_library(BlocksRuntimeStub-${SDK}-${ARCH} SHARED _add_swift_library_single(
BlocksRuntimeStub-${SDK}-${ARCH}
BlocksRuntimeStub
SHARED
DONT_EMBED_BITCODE
NOSWIFTRT
ARCHITECTURE ${ARCH}
SDK ${SDK}
INSTALL_IN_COMPONENT dev
${test_bin_dir}/BlocksRuntime.c) ${test_bin_dir}/BlocksRuntime.c)
if(CMAKE_C_COMPILER_ID STREQUAL Clang AND
NOT CMAKE_C_COMPILER_SIMULATE_ID STREQUAL MSVC)
target_compile_options(BlocksRuntimeStub-${SDK}-${ARCH} PRIVATE
-target;${SWIFT_SDK_${SDK}_ARCH_${ARCH}_TRIPLE})
endif()
set_target_properties(BlocksRuntimeStub-${SDK}-${ARCH} PROPERTIES set_target_properties(BlocksRuntimeStub-${SDK}-${ARCH} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${test_bin_dir} ARCHIVE_OUTPUT_DIRECTORY ${test_bin_dir}
LIBRARY_OUTPUT_DIRECTORY ${test_bin_dir} LIBRARY_OUTPUT_DIRECTORY ${test_bin_dir}