[android] vcpkg_configure_make correct set flags for android build

scripts/cmake/vcpkg_build_make.cmake

@@ -55,8 +55,17 @@ function(vcpkg_build_make)
         # vcpkg_build_make called without using vcpkg_configure_make before
         vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE)
     endif()
+
     include("${_VCPKG_CMAKE_VARS_FILE}")
 
+    if(VCPKG_CROSSCOMPILING)
+        if(NOT _VCPKG_HOST_CMAKE_VARS_FILE)
+            _vcpkg_cmake_to_vcpkg_arch(${CMAKE_HOST_SYSTEM_PROCESSOR} _host_arch)
+            vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_HOST_CMAKE_VARS_FILE TRIPLET ${_HOST_TRIPLET} VAR_PREFIX VCPKG_DETECTED_FOR_BUILD TARGET_ARCHITECTURE ${_host_arch})
+        endif()
+        include("${_VCPKG_HOST_CMAKE_VARS_FILE}")
+    endif()
+
     # parse parameters such that semicolons in options arguments to COMMAND don't get erased
     cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET" "")
 
@@ -79,9 +88,11 @@ function(vcpkg_build_make)
     if(WIN32)
         set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR})
         set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR})
+        set(_VCPKG_HOST_INSTALLED ${CURRENT_HOST_INSTALLED_DIR})
     else()
         string(REPLACE " " "\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}")
         string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}")
+        string(REPLACE " " "\ " _VCPKG_HOST_INSTALLED "${CURRENT_HOST_INSTALLED_DIR}")
     endif()
 
     set(MAKE )
@@ -141,19 +152,41 @@ function(vcpkg_build_make)
             set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}${_bc_SUBPATH}")
             message(STATUS "Building ${TARGET_TRIPLET}${SHORT_BUILDTYPE}")
 
-            _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${CMAKE_BUILDTYPE})
+            _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${CMAKE_BUILDTYPE} FALSE)
+            _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${CMAKE_BUILDTYPE} TRUE)
 
             if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-                set(LINKER_FLAGS_${CMAKE_BUILDTYPE} "${VCPKG_DETECTED_STATIC_LINKER_FLAGS_${CMAKE_BUILDTYPE}}")
+                _vcpkg_select_for_build_detected(
+                    CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILDTYPE} 
+                    FALSE 
+                    LINKER_FLAGS_${CMAKE_BUILDTYPE})
+                _vcpkg_select_for_build_detected(
+                    CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILDTYPE} 
+                    TRUE 
+                    LINKER_FLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD)
             else() # dynamic
-                set(LINKER_FLAGS_${CMAKE_BUILDTYPE} "${VCPKG_DETECTED_SHARED_LINKER_FLAGS_${CMAKE_BUILDTYPE}}")
+                _vcpkg_select_for_build_detected(
+                    CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILDTYPE} 
+                    FALSE 
+                    LINKER_FLAGS_${CMAKE_BUILDTYPE})
+                _vcpkg_select_for_build_detected(
+                    CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILDTYPE} 
+                    TRUE 
+                    LINKER_FLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD)
             endif()
+
             if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_C_COMPILER MATCHES "cl.exe")
                 set(LDFLAGS_${CMAKE_BUILDTYPE} "-L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib -L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link")
                 set(LINK_ENV_${CMAKE_BUILDTYPE} "$ENV{_LINK_} ${LINKER_FLAGS_${CMAKE_BUILDTYPE}}")
             else()
                 set(LDFLAGS_${CMAKE_BUILDTYPE} "-L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib -L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link ${LINKER_FLAGS_${CMAKE_BUILDTYPE}}")
             endif()
+
+            if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_FOR_BUILD_C_COMPILER MATCHES "cl.exe")
+                set(LDFLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD "-L${_VCPKG_HOST_INSTALLED}${PATH_SUFFIX}/lib -L${_VCPKG_HOST_INSTALLED}${PATH_SUFFIX}/lib/manual-link")
+            else()
+                set(LDFLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD "-L${_VCPKG_HOST_INSTALLED}${PATH_SUFFIX}/lib -L${_VCPKG_HOST_INSTALLED}${PATH_SUFFIX}/lib/manual-link ${LINKER_FLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD}")
+            endif()
 
             # Setup environment
             set(ENV{CPPFLAGS} "${CPPFLAGS_${CMAKE_BUILDTYPE}}")
@@ -164,6 +197,12 @@ function(vcpkg_build_make)
             set(ENV{LIB} "${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link/${LIB_PATHLIKE_CONCAT}")
             set(ENV{LIBPATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link/${LIBPATH_PATHLIKE_CONCAT}")
             set(ENV{LIBRARY_PATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link/${LIBRARY_PATH_PATHLIKE_CONCAT}")
+
+            set(ENV{CPPFLAGS_FOR_BUILD} "${CPPFLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD}")
+            set(ENV{CFLAGS_FOR_BUILD} "${CFLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD}")
+            set(ENV{CXXFLAGS_FOR_BUILD} "${CXXFLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD}")
+            set(ENV{LDFLAGS_FOR_BUILD} "${LDFLAGS_${CMAKE_BUILDTYPE}_FOR_BUILD}")
+
             #set(ENV{LD_LIBRARY_PATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX_${BUILDTYPE}}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX_${BUILDTYPE}}/lib/manual-link/${LD_LIBRARY_PATH_PATHLIKE_CONCAT}")
 
             if(LINK_ENV_${_VAR_SUFFIX})

scripts/cmake/vcpkg_configure_cmake.cmake

@@ -78,7 +78,7 @@ function(vcpkg_configure_cmake)
 
     cmake_parse_arguments(PARSE_ARGV 0 arg
         "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_VCPKG_IGNORE_UNUSED_VARIABLES"
-        "SOURCE_PATH;GENERATOR;LOGNAME"
+        "SOURCE_PATH;GENERATOR;LOGNAME;TRIPLET;TARGET_ARCHITECTURE"
         "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES"
     )
 
@@ -87,8 +87,16 @@ function(vcpkg_configure_cmake)
             "however, vcpkg.exe must be rebuilt by re-running bootstrap-vcpkg.bat\n")
     endif()
 
+    if(NOT arg_TRIPLET)
+        set(arg_TRIPLET ${TARGET_TRIPLET})
+    endif()
+
+    if(NOT arg_TARGET_ARCHITECTURE)
+        set(arg_TARGET_ARCHITECTURE ${VCPKG_TARGET_ARCHITECTURE})
+    endif()
+
     if(NOT arg_LOGNAME)
-        set(arg_LOGNAME config-${TARGET_TRIPLET})
+        set(arg_LOGNAME config-${arg_TRIPLET})
     endif()
 
     set(manually_specified_variables "")
@@ -134,40 +142,40 @@ function(vcpkg_configure_cmake)
     elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT _TARGETTING_UWP))
         set(GENERATOR "Ninja")
 
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
         set(GENERATOR "Visual Studio 12 2013")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
         set(GENERATOR "Visual Studio 12 2013 Win64")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
         set(GENERATOR "Visual Studio 12 2013 ARM")
 
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
         set(GENERATOR "Visual Studio 14 2015")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
         set(GENERATOR "Visual Studio 14 2015 Win64")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
         set(GENERATOR "Visual Studio 14 2015 ARM")
 
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
         set(GENERATOR "Visual Studio 15 2017")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
         set(GENERATOR "Visual Studio 15 2017 Win64")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
         set(GENERATOR "Visual Studio 15 2017 ARM")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
         set(GENERATOR "Visual Studio 15 2017")
         set(ARCH "ARM64")
 
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
         set(GENERATOR "Visual Studio 16 2019")
         set(ARCH "Win32")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
         set(GENERATOR "Visual Studio 16 2019")
         set(ARCH "x64")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
         set(GENERATOR "Visual Studio 16 2019")
         set(ARCH "ARM")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+    elseif(arg_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
         set(GENERATOR "Visual Studio 16 2019")
         set(ARCH "ARM64")
 
@@ -176,7 +184,7 @@ function(vcpkg_configure_cmake)
             set(VCPKG_CMAKE_SYSTEM_NAME Windows)
         endif()
         message(FATAL_ERROR "Unable to determine appropriate generator for: "
-            "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")
+            "${VCPKG_CMAKE_SYSTEM_NAME}-${arg_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")
     endif()
 
     # If we use Ninja, make sure it's on PATH
@@ -187,7 +195,7 @@ function(vcpkg_configure_cmake)
         list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}")
     endif()
 
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-dbg)
 
     if(DEFINED VCPKG_CMAKE_SYSTEM_NAME)
         list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}")
@@ -247,10 +255,11 @@ function(vcpkg_configure_cmake)
         endif()
     endif()
 
-    list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecure_string)
+    list(JOIN arg_TARGET_ARCHITECTURE "\;" target_architecure_string)
     list(APPEND arg_OPTIONS
         "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
-        "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
+        "-DVCPKG_TARGET_TRIPLET=${arg_TRIPLET}"
+        "-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}"
         "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}"
         "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}"
         "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
@@ -270,8 +279,7 @@ function(vcpkg_configure_cmake)
         "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}"
         "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
         "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}"
-        "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}"
-        "-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}"
+	"-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}"
         "-DCMAKE_INSTALL_LIBDIR:STRING=lib"
         "-DCMAKE_INSTALL_BINDIR:STRING=bin"
         "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
@@ -326,20 +334,20 @@ function(vcpkg_configure_cmake)
 
         if(NOT DEFINED VCPKG_BUILD_TYPE)
             _build_cmakecache(".." "rel")
-            _build_cmakecache("../../${TARGET_TRIPLET}-dbg" "dbg")
+            _build_cmakecache("../../${arg_TRIPLET}-dbg" "dbg")
         elseif(VCPKG_BUILD_TYPE STREQUAL "release")
             _build_cmakecache(".." "rel")
         elseif(VCPKG_BUILD_TYPE STREQUAL "debug")
-            _build_cmakecache("../../${TARGET_TRIPLET}-dbg" "dbg")
+            _build_cmakecache("../../${arg_TRIPLET}-dbg" "dbg")
         endif()
 
-        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure)
-        file(WRITE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja "${_contents}")
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-rel/vcpkg-parallel-configure)
+        file(WRITE ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja "${_contents}")
 
-        message(STATUS "Configuring ${TARGET_TRIPLET}")
+        message(STATUS "Configuring ${arg_TRIPLET}")
         vcpkg_execute_required_process(
             COMMAND ninja -v
-            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-rel/vcpkg-parallel-configure
             LOGNAME ${arg_LOGNAME}
         )
 
@@ -348,11 +356,11 @@ function(vcpkg_configure_cmake)
             "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log")
     else()
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-            message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-            file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+            message(STATUS "Configuring ${arg_TRIPLET}-dbg")
+            file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-dbg)
             vcpkg_execute_required_process(
                 COMMAND ${dbg_command}
-                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-dbg
                 LOGNAME ${arg_LOGNAME}-dbg
             )
             list(APPEND config_logs
@@ -361,11 +369,11 @@ function(vcpkg_configure_cmake)
         endif()
 
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-            message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-            file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+            message(STATUS "Configuring ${arg_TRIPLET}-rel")
+            file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-rel)
             vcpkg_execute_required_process(
                 COMMAND ${rel_command}
-                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${arg_TRIPLET}-rel
                 LOGNAME ${arg_LOGNAME}-rel
             )
             list(APPEND config_logs