Browse Source

Merge pull request #9044 from lat9nq/mingw-gcc-revert

ci/windows: Revert to using GCC for MinGW builds
nce_cpp
liamwhite 3 years ago
committed by GitHub
parent
commit
354ca7ca6b
  1. 6
      .ci/scripts/windows/docker.sh

6
.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 \

Loading…
Cancel
Save