[CI][folly] Fix cross-compilation failure on arm64-linux by pre-caching try_run results (#50543)

This commit is contained in:
Javier Matos Denizac 2026-03-18 23:00:24 -07:00 committed by GitHub
parent 7c82120d34
commit 5150c4ab19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 19 additions and 5 deletions

View File

@ -41,6 +41,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"zstd" VCPKG_LOCK_FIND_PACKAGE_ZSTD
)
set(CROSSCOMP_OPTIONS "")
if(VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_LINUX)
# Seed try_run results for cross-compiling; binaries cannot execute on the build host.
set(CROSSCOMP_OPTIONS
-DFOLLY_HAVE_UNALIGNED_ACCESS_EXITCODE=0
-DFOLLY_HAVE_WEAK_SYMBOLS_EXITCODE=0
-DFOLLY_HAVE_LINUX_VDSO_EXITCODE=0
-DFOLLY_HAVE_WCHAR_SUPPORT_EXITCODE=0
-DHAVE_VSNPRINTF_ERRORS_EXITCODE=0
)
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
@ -53,6 +64,7 @@ vcpkg_cmake_configure(
-DVCPKG_LOCK_FIND_PACKAGE_LibUnwind=${VCPKG_TARGET_IS_LINUX}
-DVCPKG_LOCK_FIND_PACKAGE_ZLIB=ON
${FEATURE_OPTIONS}
${CROSSCOMP_OPTIONS}
MAYBE_UNUSED_VARIABLES
MSVC_USE_STATIC_RUNTIME
)

View File

@ -1,6 +1,7 @@
{
"name": "folly",
"version-string": "2026.02.23.00",
"port-version": 1,
"description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
"homepage": "https://github.com/facebook/folly",
"license": "Apache-2.0",

View File

@ -199,7 +199,6 @@ fluidlite:x64-windows-static-md=skip
fluidlite:x64-windows-static=skip
fluidlite:x64-windows=skip
fluidlite:x86-windows=skip
folly:arm64-linux=fail
freeglut:arm-neon-android=fail # unsupported option '-mfloat-abi=', ALooper_pollAll no longer available
freeglut:arm64-android=fail
freeglut:arm64-linux=fail

View File

@ -349,9 +349,6 @@ flashlight-text[kenlm]:arm64-windows=cascade
fltk:arm64-linux=fail
fluidsynth[pulseaudio]:arm64-linux=cascade
fluidsynth[pulseaudio](android | osx | windows)=cascade
folly:arm64-linux=fail
folly[libsodium]:arm64-linux=cascade
folly[liburing](!linux)=cascade
forge:arm64-linux=cascade
forge:x86-windows=fail
freealut:arm64-linux=cascade

View File

@ -3114,7 +3114,7 @@
},
"folly": {
"baseline": "2026.02.23.00",
"port-version": 0
"port-version": 1
},
"font-chef": {
"baseline": "1.1.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9b30ba73dcd60645143155b4b8a57cd0d3c88e66",
"version-string": "2026.02.23.00",
"port-version": 1
},
{
"git-tree": "9906c8bf3be59d5410ea3d6c10b59a5c2c7b6557",
"version-string": "2026.02.23.00",