3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 12:18:01 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg baseline][vcpkg_configure_make] Fix arm64-windows, arm-uwp (#15740)

Browse Source 
* [vcpkg_configure_make] Fix arm64-windows

* [vcpkg_configure_make] Fix arm-uwp
This commit is contained in:
pastdue 2021-01-19 22:40:30 -05:00 committed by GitHub
parent da28170ca9
commit 3912524298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/cmake/vcpkg_configure_make.cmake
View File

@ -392,8 +392,13 @@ function(vcpkg_configure_make)
list(APPEND _csc_OPTIONS gl_cv_double_slash_root=yes list(APPEND _csc_OPTIONS gl_cv_double_slash_root=yes
ac_cv_func_memmove=yes) ac_cv_func_memmove=yes)
#list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks #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) 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() endif()
else() else()
string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR}) string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR})