2020-11-06 17:02:29 +01:00
|
|
|
diff --git a/swift/cmake/modules/SwiftAndroidSupport.cmake b/swift/cmake/modules/SwiftAndroidSupport.cmake
|
|
|
|
|
index c8d224c958..9b0b9043af 100644
|
|
|
|
|
--- a/swift/cmake/modules/SwiftAndroidSupport.cmake
|
|
|
|
|
+++ b/swift/cmake/modules/SwiftAndroidSupport.cmake
|
2021-10-24 11:08:33 +02:00
|
|
|
@@ -1,7 +1,7 @@
|
2020-11-06 17:02:29 +01:00
|
|
|
function(swift_android_sysroot sysroot_var_name)
|
|
|
|
|
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
|
2021-10-24 11:08:33 +02:00
|
|
|
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} platform)
|
|
|
|
|
- set(${sysroot_var_name} "${SWIFT_ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/${platform}-x86_64/sysroot" PARENT_SCOPE)
|
2020-11-06 17:02:29 +01:00
|
|
|
+ set(${sysroot_var_name} "${SWIFT_ANDROID_NDK_PATH}/sysroot" PARENT_SCOPE)
|
|
|
|
|
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
|
|
|
|
|
set(${sysroot_var_name} "${SWIFT_ANDROID_NATIVE_SYSROOT}" PARENT_SCOPE)
|
|
|
|
|
else()
|
2021-10-24 11:08:33 +02:00
|
|
|
@@ -12,7 +12,7 @@ endfunction()
|
|
|
|
|
function(swift_android_tools_path arch path_var_name)
|
|
|
|
|
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
|
|
|
|
|
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} platform)
|
|
|
|
|
- set(${path_var_name} "${SWIFT_ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/${platform}-x86_64/bin" PARENT_SCOPE)
|
|
|
|
|
+ set(${path_var_name} "${SWIFT_ANDROID_NDK_PATH}/bin" PARENT_SCOPE)
|
2020-11-06 17:02:29 +01:00
|
|
|
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
|
|
|
|
|
set(${path_var_name} "${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/bin" PARENT_SCOPE)
|
|
|
|
|
else()
|
