summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.ci/scripts/common/post-upload.sh2
-rwxr-xr-x.ci/scripts/windows/docker.sh3
2 files changed, 2 insertions, 3 deletions
diff --git a/.ci/scripts/common/post-upload.sh b/.ci/scripts/common/post-upload.sh
index 91ef750fe..a4e3070fd 100644
--- a/.ci/scripts/common/post-upload.sh
+++ b/.ci/scripts/common/post-upload.sh
@@ -4,7 +4,7 @@
4cp license.txt "$DIR_NAME" 4cp license.txt "$DIR_NAME"
5cp README.md "$DIR_NAME" 5cp README.md "$DIR_NAME"
6 6
7if [[ "x${NO_SOURCE_PACK}" == "x" ]]; then 7if [[ -z "${NO_SOURCE_PACK}" ]]; then
8 tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt 8 tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt
9 cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME" 9 cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME"
10fi 10fi
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh
index d0c70bf09..dcdf39e3e 100755
--- a/.ci/scripts/windows/docker.sh
+++ b/.ci/scripts/windows/docker.sh
@@ -14,8 +14,7 @@ mkdir -p build && cd build
14export LDFLAGS="-fuse-ld=lld" 14export LDFLAGS="-fuse-ld=lld"
15# -femulated-tls required due to an incompatibility between GCC and Clang 15# -femulated-tls required due to an incompatibility between GCC and Clang
16# TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate 16# TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate
17export CFLAGS="-femulated-tls" 17export CXXFLAGS="-femulated-tls"
18export CXXFLAGS="${CFLAGS}"
19cmake .. \ 18cmake .. \
20 -DCMAKE_BUILD_TYPE=Release \ 19 -DCMAKE_BUILD_TYPE=Release \
21 -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \ 20 -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \