@@ -28,7 +28,7 @@ function(_report_sdk prefix)
28
28
message (STATUS " ${arch} LIB: ${${arch} _LIB}" )
29
29
endforeach ()
30
30
elseif ("${prefix} " STREQUAL "ANDROID" )
31
- message (STATUS " NDK Dir : $ENV{SWIFT_ANDROID_NDK_PATH} " )
31
+ message (STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH} " )
32
32
foreach (arch ${SWIFT_SDK_${prefix}_ARCHITECTURES} )
33
33
swift_android_include_for_arch (${arch} ${arch} _INCLUDE )
34
34
swift_android_lib_for_arch (${arch} ${arch} _LIB )
@@ -225,10 +225,14 @@ macro(configure_sdk_unix name architectures)
225
225
endif ()
226
226
227
227
# Get the prebuilt suffix to create the correct toolchain path when using the NDK
228
- if ("${CMAKE_HOST_SYSTEM_NAME} " STREQUAL "Darwin" )
229
- set (_swift_android_prebuilt_build "darwin-x86_64" )
230
- elseif ("${CMAKE_HOST_SYSTEM_NAME} " STREQUAL "Linux" )
231
- set (_swift_android_prebuilt_build "linux-x86_64" )
228
+ if (CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin )
229
+ set (_swift_android_prebuilt_build darwin-x86_64 )
230
+ elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL Linux )
231
+ set (_swift_android_prebuilt_build linux-x86_64 )
232
+ elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL Windows )
233
+ set (_swift_android_prebuilt_build Windows-x86_64 )
234
+ else ()
235
+ message (SEND_ERROR "cannot cross-compile to android from ${CMAKE_HOST_SYSTEM_NAME} " )
232
236
endif ()
233
237
if ("${arch} " STREQUAL "i686" )
234
238
set (SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH
0 commit comments