mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vcpkg_configure_make: MacOS assume target arch is host arch (#18632)

Browse Source 
This is to guard against MacOS triplets that don't list
VCPKG_OSX_ARCHITECTURES
This commit is contained in:
Eric Kilmer 2021-07-23 00:56:14 -04:00 committed by GitHub
parent 22a15e3995
commit 84b96cf7b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/cmake/vcpkg_configure_make.cmake
View File

@ -148,7 +148,9 @@ endmacro()
macro(_vcpkg_determine_autotools_target_arch_mac out_var) macro(_vcpkg_determine_autotools_target_arch_mac out_var)
list(LENGTH VCPKG_OSX_ARCHITECTURES _num_osx_archs) 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") set(${out_var} "universal")
else() else()
# Better match the arch behavior of config.guess # Better match the arch behavior of config.guess