diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-06-21 20:21:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 20:21:13 -0400 |
| commit | ab0e71d7cb5f75c6a7b5269bc36c46820a825b12 (patch) | |
| tree | 375681528f930f9f5e17a19d651f10a40e308b96 /.ci/scripts/windows/docker.sh | |
| parent | 737c446fc18618cf80a1243104ac8f5114c29a22 (diff) | |
| parent | c42fde2a373f676b5464168a8df14b22c6b46755 (diff) | |
Merge pull request #8455 from lat9nq/mingw-clang
ci/windows: Use Clang for MinGW builds
Diffstat (limited to '.ci/scripts/windows/docker.sh')
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 584b9b39f..f53d837d1 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -1,12 +1,27 @@ #!/bin/bash -ex +set -e + cd /yuzu ccache -s mkdir build || true && cd build -cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON -ninja +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 +cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="-femulated-tls" \ + -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWClangCross.cmake" \ + -DDISPLAY_VERSION=$1 \ + -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ + -DENABLE_QT_TRANSLATION=ON \ + -DUSE_CCACHE=ON \ + -DYUZU_USE_BUNDLED_SDL2=OFF \ + -DYUZU_USE_EXTERNAL_SDL2=OFF \ + -GNinja +ninja yuzu yuzu-cmd ccache -s |