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 @@
 cp license.txt "$DIR_NAME"
 cp README.md "$DIR_NAME"
 
-if [[ "x${NO_SOURCE_PACK}" == "x" ]]; then
+if [[ -z "${NO_SOURCE_PACK}" ]]; then
   tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt
   cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME"
 fi
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
 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 CFLAGS="-femulated-tls"
-export CXXFLAGS="${CFLAGS}"
+export CXXFLAGS="-femulated-tls"
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \