Page MenuHomePhabricator
Files F3525301

D5590.id18297.diff
No OneTemporary
Actions

D5590.id18297.diff
View Options

diff --git a/native/android/app/CMakeLists.txt b/native/android/app/CMakeLists.txt
--- a/native/android/app/CMakeLists.txt
+++ b/native/android/app/CMakeLists.txt
@@ -51,7 +51,14 @@
endif()
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} CMAKE_HOST_SYSTEM_NAME_LOWER)
-set(AR $ENV{ANDROID_HOME}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/${CMAKE_HOST_SYSTEM_NAME_LOWER}-x86_64/bin/${Rust_CARGO_TARGET}-ar)
+set(_toolchain_path
+ "$ENV{ANDROID_HOME}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/${CMAKE_HOST_SYSTEM_NAME_LOWER}-x86_64/bin"
+)
+if(EXISTS "${_toolchain_path}/${Rust_CARGO_TARGET}-ar")
+ set(AR "${_toolchain_path}/${Rust_CARGO_TARGET}-ar")
+else()
+ set(AR "${_toolchain_path}/llvm-ar")
+endif()
FetchContent_Declare(
Corrosion

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 24, 4:17 PM (10 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2699582
Default Alt Text
D5590.id18297.diff (750 B)

Event Timeline