diff options
| author | Eric Kilmer <eric.d.kilmer@gmail.com> | 2021-07-23 00:56:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 21:56:14 -0700 |
| commit | 84b96cf7b3e0848591dce83474e9d6f82885504b (patch) | |
| tree | a4ae3afa2bc361067135e66356555ce58d254dc9 /scripts | |
| parent | 22a15e3995c3b6992a8f3c988a05ae413d32e9bd (diff) | |
| download | vcpkg-84b96cf7b3e0848591dce83474e9d6f82885504b.tar.gz vcpkg-84b96cf7b3e0848591dce83474e9d6f82885504b.zip | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index d1b87d454..599eaf591 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
|