diff options
| author | lat9nq <[email protected]> | 2022-10-09 13:56:31 -0400 |
|---|---|---|
| committer | lat9nq <[email protected]> | 2022-10-09 17:47:52 -0400 |
| commit | 682c50715ce3240144507a3b0d965e45c5616c3b (patch) | |
| tree | 7a0aa9123343702512b8e0292830f403f29a82a5 /.ci | |
| parent | c3cae9d99263afd46a1d3205b29cfa62bebd18b3 (diff) | |
| download | yuzu-android-682c50715ce3240144507a3b0d965e45c5616c3b.tar.gz yuzu-android-682c50715ce3240144507a3b0d965e45c5616c3b.zip | |
ci/windows: Revert to using GCC for MinGW builds
Using MinGW in the future may not be ideal as it does not work very well
with crash dumps (#8682).
Switch back to GCC on MinGW. This also gives CI a way to check GCC 12
(as of writing, or whatever version of mingw-gcc Arch happens to be
shipping on a given week).
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 6f522feed..0be3613aa 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -10,13 +10,9 @@ set -e ccache -sv mkdir -p build && cd build -export LDFLAGS="-fuse-ld=lld" -# -femulated-tls required due to an incompatibility between GCC and Clang -# TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate -export CXXFLAGS="-femulated-tls" cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWCross.cmake" \ -DDISPLAY_VERSION="$1" \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DENABLE_QT_TRANSLATION=ON \ |