Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

cmake/modules/SwiftConfigureSDK.cmake

@@ -28,7 +28,7 @@ function(_report_sdk prefix)
       message(STATUS "  ${arch} LIB: ${${arch}_LIB}")
     endforeach()
   elseif("${prefix}" STREQUAL "ANDROID")
-    message(STATUS " NDK Dir: $ENV{SWIFT_ANDROID_NDK_PATH}")
+    message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
     foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
       swift_android_include_for_arch(${arch} ${arch}_INCLUDE)
       swift_android_lib_for_arch(${arch} ${arch}_LIB)
@@ -225,10 +225,14 @@ macro(configure_sdk_unix name architectures)
       endif()
 
       # Get the prebuilt suffix to create the correct toolchain path when using the NDK
-      if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
-        set(_swift_android_prebuilt_build "darwin-x86_64")
-      elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
-        set(_swift_android_prebuilt_build "linux-x86_64")
+      if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
+        set(_swift_android_prebuilt_build darwin-x86_64)
+      elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Linux)
+        set(_swift_android_prebuilt_build linux-x86_64)
+      elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
+        set(_swift_android_prebuilt_build Windows-x86_64)
+      else()
+        message(SEND_ERROR "cannot cross-compile to android from ${CMAKE_HOST_SYSTEM_NAME}")
       endif()
       if("${arch}" STREQUAL "i686")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH