External build system generator release 10

Update tools: yexport

CMakeLists.txt

@@ -57,7 +57,7 @@ conan_cmake_install(
   SETTINGS ${settings}
 )
 
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 elseif (APPLE)
   include(CMakeLists.darwin.txt)

cmake/global_flags.cmake

@@ -42,7 +42,6 @@ set(CMAKE_CXX_FLAGS "\
   -D_LARGEFILE_SOURCE \
   -D__STDC_CONSTANT_MACROS \
   -D__STDC_FORMAT_MACROS \
-  -D_FILE_OFFSET_BITS=64 \
   -D_GNU_SOURCE \
   -D_YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE \
   -D__LONG_LONG_SUPPORTED \
@@ -75,6 +74,12 @@ elseif(UNIX)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-init-array")
 endif()
 
+if (ANDROID)
+  include_directories(SYSTEM ${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/include)
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
+endif()
+
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   set(CMAKE_CXX_FLAGS "\
   ${CMAKE_CXX_FLAGS} \
@@ -113,3 +118,9 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   -DCX16_ENABLED=1 \
   ")
 endif()
+
+if (NOT CMAKE_CROSSCOMPILING)
+  set(TOOLS_ROOT ${CMAKE_BINARY_DIR})
+elseif(NOT TOOLS_ROOT)
+  message(FATAL_ERROR "TOOLS_ROOT is required for crosscompilation")
+endif()

cmake/global_vars.cmake

@@ -6,7 +6,7 @@
 # original buildsystem will not be accepted.
 
 
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   set(YASM_FLAGS -f elf64 -D UNIX -D _x86_64_ -D_YASM_ -g dwarf2)
   set(BISON_FLAGS -v)
   set(RAGEL_FLAGS -L -I ${CMAKE_SOURCE_DIR}/)

contrib/libs/cctz/CMakeLists.txt

@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 endif()

contrib/libs/curl/CMakeLists.txt

@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 endif()

contrib/libs/cxxsupp/builtins/CMakeLists.txt

@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 endif()

contrib/libs/jemalloc/CMakeLists.txt

@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 endif()

contrib/libs/libc_compat/CMakeLists.txt

@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 endif()

contrib/libs/libevent/event_core/CMakeLists.txt

@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 endif()

contrib/libs/libunwind/CMakeLists.txt

@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux.txt)
 endif()