diff options
| author | pastdue <30942300+past-due@users.noreply.github.com> | 2021-01-19 22:40:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 19:40:30 -0800 |
| commit | 391252429871584674005b3ed4e131c60425f2fe (patch) | |
| tree | 546916c0a2ff72ae788bca6231abedfc82c65ffe /scripts | |
| parent | da28170ca93072606429d9b8bac5caa163147a14 (diff) | |
| download | vcpkg-391252429871584674005b3ed4e131c60425f2fe.tar.gz vcpkg-391252429871584674005b3ed4e131c60425f2fe.zip | |
[vcpkg baseline][vcpkg_configure_make] Fix arm64-windows, arm-uwp (#15740)
* [vcpkg_configure_make] Fix arm64-windows
* [vcpkg_configure_make] Fix arm-uwp
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index e7af4713c..122281f42 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -392,8 +392,13 @@ function(vcpkg_configure_make) list(APPEND _csc_OPTIONS gl_cv_double_slash_root=yes
ac_cv_func_memmove=yes)
#list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks
- if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+ if(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]64$")
list(APPEND _csc_OPTIONS gl_cv_host_cpu_c_abi=no)
+ # Currently needed for arm64 because objdump yields: "unrecognised machine type (0xaa64) in Import Library Format archive"
+ list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all)
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]$")
+ # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive"
+ list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all)
endif()
else()
string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR})
|