diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 4342e3e6ac1..dbbf55c1478 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -9,7 +9,6 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_win64 export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" # Check that https://packages.debian.org/trixie/g++-mingw-w64-ucrt64 can cross-compile export HOST=x86_64-w64-mingw32ucrt -export DEP_OPTS="CC=${HOST}-gcc CXX=${HOST}-g++" export PACKAGES="g++-mingw-w64-ucrt64 nsis" export RUN_UNIT_TESTS=false export RUN_FUNCTIONAL_TESTS=false diff --git a/depends/README.md b/depends/README.md index 71110e945e6..706c3db0d95 100644 --- a/depends/README.md +++ b/depends/README.md @@ -122,7 +122,8 @@ Common `host-platform-triplet`s for cross compilation are: - `i686-pc-linux-gnu` for Linux x86 32 bit - `x86_64-pc-linux-gnu` for Linux x86 64 bit -- `x86_64-w64-mingw32` for Win64 +- `x86_64-w64-mingw32` for Windows using MSVCRT +- `x86_64-w64-mingw32ucrt` for Windows using UCRT - `x86_64-apple-darwin` for Intel macOS - `arm64-apple-darwin` for ARM macOS - `arm-linux-gnueabihf` for Linux ARM 32 bit @@ -144,10 +145,14 @@ proceeding with a cross-compile. Under the depends directory, create a subdirectory named `SDKs`. Then, place the extracted SDK under this new directory. For more information, see [SDK Extraction](../contrib/macdeploy/README.md#sdk-extraction). -#### For Win64 cross compilation +#### For Windows cross compilation using MSVCRT apt install g++-mingw-w64-x86-64-posix +#### For Windows cross compilation using UCRT + + apt install g++-mingw-w64-ucrt64 + #### For linux (including i386, ARM) cross compilation Common linux dependencies: