From 9266d4817de63dd1b86ec6b61dd74882684c5731 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 17 Sep 2025 10:44:47 -0400 Subject: [PATCH] Android: Allow custom compilers with NDK If the user or toolchain file has already set `CMAKE_{C,CXX}_COMPILER`, do not override it with the NDK-provided toolchain. Fixes: #27162 --- Modules/Platform/Android-Determine-C.cmake | 3 +++ Modules/Platform/Android-Determine-CXX.cmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Modules/Platform/Android-Determine-C.cmake b/Modules/Platform/Android-Determine-C.cmake index c7d1d1512c..1d93cd724b 100644 --- a/Modules/Platform/Android-Determine-C.cmake +++ b/Modules/Platform/Android-Determine-C.cmake @@ -1,2 +1,5 @@ +if(CMAKE_C_COMPILER) + return() +endif() include(Platform/Android/Determine-Compiler) __android_determine_compiler(C) diff --git a/Modules/Platform/Android-Determine-CXX.cmake b/Modules/Platform/Android-Determine-CXX.cmake index 3a3de880a4..e7d96beae2 100644 --- a/Modules/Platform/Android-Determine-CXX.cmake +++ b/Modules/Platform/Android-Determine-CXX.cmake @@ -1,2 +1,5 @@ +if(CMAKE_CXX_COMPILER) + return() +endif() include(Platform/Android/Determine-Compiler) __android_determine_compiler(CXX)