romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-09 20:57:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

limit ninja to native x64 targets only

Browse source
This commit is contained in:
Viktor Szakats 2025-08-17 11:19:58 +02:00
parent 3cc774874b
commit 419ca2f143
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/windows.yml vendored
View file

@ -827,15 +827,20 @@ jobs:
ldflags='-OPT:NOREF -OPT:NOICF -APPCONTAINER:NO'
vsglobals=';AppxPackage=false;WindowsAppContainer=false'
fi
[ "${MATRIX_ARCH}" = 'arm64' ] && options+=' -A ARM64'
[ "${MATRIX_ARCH}" = 'x64' ] && options+=' -A x64'
[ "${MATRIX_ARCH}" = 'x86' ] && options+=' -A Win32'
if [ "${TFLAGS}" = 'skiprun' ]; then
options+=' -D_CURL_SKIP_BUILD_CERTS=ON'
fi
if [ "${TFLAGS}" = 'skiprun' ] && [ "${MATRIX_ARCH}" != 'x64' ]; then
[ "${MATRIX_ARCH}" = 'arm64' ] && options+=' -A ARM64'
[ "${MATRIX_ARCH}" = 'x64' ] && options+=' -A x64'
[ "${MATRIX_ARCH}" = 'x86' ] && options+=' -A Win32'
options+=" -DCMAKE_VS_GLOBALS=TrackFileAccess=false${vsglobals}"
else
# Use Ninja when running tests to avoid MSBuild heuristics picking up
# "error messages" in the test log output and making the job fail.
# Use Ninja when running tests to avoid MSBuild heuristics picking
# up "error messages" in the test log output and making the job fail.
# Unfortunately switching CPU target requires vcvarsall.bat, which
# has no stable disk location, its an MS-DOS batch file setting env,
# and makes it problematic to use from this script.
options+=' -G Ninja'
options+=' -DCMAKE_C_COMPILER=cl.exe'
fi