cmake: Fix C compiler ABI detection with GCC
Closes https://github.com/termux/termux-packages/issues/6960
This commit is contained in:
parent
73643a6e3a
commit
3dc44c91fe
|
@ -0,0 +1,17 @@
|
|||
--- a/Modules/Platform/Android-GNU.cmake
|
||||
+++ b/Modules/Platform/Android-GNU.cmake
|
||||
@@ -24,6 +24,14 @@
|
||||
return()
|
||||
endif()
|
||||
|
||||
+# Natively compiling on an Android host doesn't use the NDK cross-compilation
|
||||
+# tools.
|
||||
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")
|
||||
+ macro(__android_compiler_gnu lang)
|
||||
+ endmacro()
|
||||
+ return()
|
||||
+endif()
|
||||
+
|
||||
include(Platform/Android-Common)
|
||||
|
||||
include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-GNU)
|
|
@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
|
|||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
# When updating version here, please update termux_setup_cmake.sh as well.
|
||||
TERMUX_PKG_VERSION=3.25.1
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8
|
||||
TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, zlib"
|
||||
|
|
Loading…
Reference in New Issue