From 84b96cf7b3e0848591dce83474e9d6f82885504b Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 23 Jul 2021 00:56:14 -0400 Subject: [PATCH] vcpkg_configure_make: MacOS assume target arch is host arch (#18632) This is to guard against MacOS triplets that don't list VCPKG_OSX_ARCHITECTURES --- scripts/cmake/vcpkg_configure_make.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index d1b87d454a0..599eaf5917c 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -148,7 +148,9 @@ endmacro() macro(_vcpkg_determine_autotools_target_arch_mac out_var) list(LENGTH VCPKG_OSX_ARCHITECTURES _num_osx_archs) - if(_num_osx_archs GREATER_EQUAL 2) + if(_num_osx_archs EQUAL 0) + set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + elseif(_num_osx_archs GREATER_EQUAL 2) set(${out_var} "universal") else() # Better match the arch behavior of config.guess