From fdb593292ccd77a0d3a83de4bce60d1eb201af4e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 4 Nov 2021 05:29:29 +0100 Subject: [PATCH] [vcpkg] Always use an autotools build triplet (#18130) * Always use a build triplet for mingw * [vcpkg_configure_make] Always assume cross-compilation Co-authored-by: Robert Schumacher Co-authored-by: NancyLi1013 --- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index da0fd2aad39..aa054222c7d 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -306,7 +306,7 @@ function(vcpkg_configure_make) list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4) vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) endif() - if (arg_AUTOCONFIG AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET OR VCPKG_CROSSCOMPILING AND NOT arg_BUILD_TRIPLET) + if (arg_DETERMINE_BUILD_TRIPLET OR NOT arg_BUILD_TRIPLET) z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) # VCPKG_HOST => machine you are building on => --build= z_vcpkg_determine_autotools_target_cpu(TARGET_ARCH) # --build: the machine you are building on