[android] vcpkg_configure_make correct set flags for android build

scripts/cmake/vcpkg_configure_make.cmake

@@ -139,6 +139,14 @@ macro(_vcpkg_determine_autotools_target_cpu out_var)
     endif()
 endmacro()
 
+macro(_vcpkg_determine_autotools_target_os out_var)
+    if (VCPKG_DETECTED_CMAKE_SYSTEM_NAME MATCHES "Android")
+        set(${out_var} "linux-android")
+    else()
+        message(FATAL_ERROR "Unsupported target os ${VCPKG_DETECTED_CMAKE_SYSTEM_NAME} in _vcpkg_determine_autotools_target_os!")
+    endif()
+endmacro()
+
 macro(_vcpkg_backup_env_variable envvar)
     if(DEFINED ENV{${envvar}})
         set(${envvar}_BACKUP "$ENV{${envvar}}")
@@ -244,8 +252,10 @@ function(vcpkg_configure_make)
     # Backup environment variables
     # CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJCXX R UPC Y 
     set(_cm_FLAGS AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC)
+    set(_cm_TOOLS CC CXX AR AS LD RANLIB STRIP)
     list(TRANSFORM _cm_FLAGS APPEND "FLAGS")
     _vcpkg_backup_env_variables(${_cm_FLAGS})
+    _vcpkg_backup_env_variables(${_cm_TOOLS})
 
 
     # FC fotran compiler | FF Fortran 77 compiler 
@@ -396,6 +406,17 @@ function(vcpkg_configure_make)
             list(APPEND _csc_OPTIONS gl_cv_host_cpu_c_abi=no)
         endif()
     else()
+        if (VCPKG_DETECTED_CMAKE_CROSSCOMPILING)
+            _vcpkg_determine_autotools_target_cpu(TARGET_ARCH)
+            _vcpkg_determine_autotools_target_os(TARGET_OS)
+            # --build: the machine you are building on usualy guessed ok
+            # --host: the machine you are building for
+            # --target: the machine that CC will produce binaries for
+            # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler
+            # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host
+            string(APPEND _csc_BUILD_TRIPLET "--host=${TARGET_ARCH}-${TARGET_OS}") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target)
+            debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}")
+        endif()
         string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR})
         string(REPLACE " " "\ " _VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR})
         set(EXTRA_QUOTES)
@@ -647,6 +668,24 @@ function(vcpkg_configure_make)
         endif()
 
         # Setup environment
+        if (NOT CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_CROSSCOMPILING)
+            if (VCPKG_DETECTED_CMAKE_C_COMPILER)
+                set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
+            endif()
+            if (VCPKG_DETECTED_CMAKE_CXX_COMPILER)
+                set(ENV{CXX} "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}")
+            endif()
+            if (VCPKG_DETECTED_CMAKE_LINKER)
+                set(ENV{LD} "${VCPKG_DETECTED_CMAKE_LINKER}")
+            endif()
+            set(_tools AR RANLIB STRIP NM OBJDUMP DLLTOOL MT STRIP AS)
+            foreach (_toolname ${_tools})
+                if (VCPKG_DETECTED_CMAKE_${_toolname})
+                    set(ENV{${_toolname}} ${VCPKG_DETECTED_CMAKE_${_toolname}})
+                endif()
+            endforeach()
+            list(APPEND _csc_OPTIONS "--with-sysroot=${VCPKG_DETECTED_CMAKE_SYSROOT}")
+        endif()
         set(ENV{CPPFLAGS} "${CPPFLAGS_${_buildtype}}")
         set(ENV{CFLAGS} "${CFLAGS_${_buildtype}}")
         set(ENV{CXXFLAGS} "${CXXFLAGS_${_buildtype}}")
@@ -721,7 +760,7 @@ function(vcpkg_configure_make)
     endforeach()
 
     # Restore environment
-    _vcpkg_restore_env_variables(${_cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH)
+    _vcpkg_restore_env_variables(${_cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH ${_cm_TOOLS})
 
     SET(_VCPKG_PROJECT_SOURCE_PATH ${_csc_SOURCE_PATH} PARENT_SCOPE)
     set(_VCPKG_PROJECT_SUBPATH ${_csc_PROJECT_SUBPATH} PARENT_SCOPE)

scripts/get_cmake_vars/CMakeLists.txt

@@ -14,7 +14,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
                                             CMAKE_OSX_SYSROOT)
 endif()
 # Programs to check
-set(PROGLIST AR RANLIB STRIP NM OBJDUMP DLLTOOL MT LINKER)
+set(PROGLIST AR RANLIB STRIP NM OBJDUMP DLLTOOL MT LINKER AS)
 foreach(prog IN LISTS PROGLIST)
     list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog})
 endforeach()
@@ -68,6 +68,44 @@ endif()
 
 project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES})
 
+if (CMAKE_CROSSCOMPILING)
+    macro(_append_to target value)
+        set(${target} "${${target}} ${value}")
+    endmacro()
+    if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            _append_to(CMAKE_CXX_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
+            _append_to(CMAKE_C_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
+            _append_to(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
+            _append_to(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
+        else()
+            _append_to(CMAKE_CXX_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}")
+            _append_to(CMAKE_C_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}")
+            _append_to(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}")
+            _append_to(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}")
+        endif()
+    endif()
+    if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            _append_to(CMAKE_CXX_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+            _append_to(CMAKE_C_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+            _append_to(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+            _append_to(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+        else()
+            _append_to(CMAKE_CXX_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+            _append_to(CMAKE_C_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+            _append_to(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+            _append_to(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+        endif()
+    endif()
+    if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT)
+        _append_to(CMAKE_CXX_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
+        _append_to(CMAKE_C_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
+        _append_to(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
+        _append_to(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
+    endif()
+endif()
+
 foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK)
   string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${VAR} \"${${VAR}}\")\n")
 endforeach()