From aa8b8c07bbb30781edc6f9df5471f002440fb5fc Mon Sep 17 00:00:00 2001
From: Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
Date: Tue, 3 Aug 2021 16:01:34 -0300
Subject: [PATCH] Improved CI build scripts 3.

---
 .github/workflows/windows-msys.yml |  1 +
 ports/ci/linux-mingw/build.sh      | 12 ++++--------
 ports/ci/windows-msys/build.sh     |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/windows-msys.yml b/.github/workflows/windows-msys.yml
index b8ce6e9..f1e8b40 100644
--- a/.github/workflows/windows-msys.yml
+++ b/.github/workflows/windows-msys.yml
@@ -3,6 +3,7 @@ name: Windows MSYS
 on: [push, pull_request]
 
 env:
+  DISABLE_CCACHE: 1
   NJOBS: 4
 
 jobs:
diff --git a/ports/ci/linux-mingw/build.sh b/ports/ci/linux-mingw/build.sh
index 6df34e5..cdc783e 100644
--- a/ports/ci/linux-mingw/build.sh
+++ b/ports/ci/linux-mingw/build.sh
@@ -35,8 +35,6 @@ INSTALL_PREFIX=${PWD}/package-data-${COMPILER}
 echo
 echo "Building x64 virtual camera driver"
 echo
-COMPILER_C=x86_64-w64-mingw32-${COMPILER_C}
-COMPILER_CXX=x86_64-w64-mingw32-${COMPILER_CXX}
 buildDir=build-${COMPILER}-x64
 mkdir ${buildDir}
 x86_64-w64-mingw32-cmake \
@@ -45,16 +43,14 @@ x86_64-w64-mingw32-cmake \
     -B ${buildDir} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-    -DCMAKE_C_COMPILER="${COMPILER_C}" \
-    -DCMAKE_CXX_COMPILER="${COMPILER_CXX}" \
+    -DCMAKE_C_COMPILER="x86_64-w64-mingw32-${COMPILER_C}" \
+    -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-${COMPILER_CXX}" \
     ${EXTRA_PARAMS}
 cmake --build ${buildDir} --parallel ${NJOBS}
 cmake --build ${buildDir} --target install
 echo
 echo "Building x86 virtual camera driver"
 echo
-COMPILER_C=i686-w64-mingw32-${COMPILER_C}
-COMPILER_CXX=i686-w64-mingw32-${COMPILER_CXX}
 buildDir=build-${COMPILER}-x86
 mkdir ${buildDir}
 i686-w64-mingw32-cmake \
@@ -63,8 +59,8 @@ i686-w64-mingw32-cmake \
     -B ${buildDir} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-    -DCMAKE_C_COMPILER="${COMPILER_C}" \
-    -DCMAKE_CXX_COMPILER="${COMPILER_CXX}" \
+    -DCMAKE_C_COMPILER="i686-w64-mingw32-${COMPILER_C}" \
+    -DCMAKE_CXX_COMPILER="i686-w64-mingw32-${COMPILER_CXX}" \
     ${EXTRA_PARAMS}
 cmake --build ${buildDir} --parallel ${NJOBS}
 cmake --build ${buildDir} --target install
diff --git a/ports/ci/windows-msys/build.sh b/ports/ci/windows-msys/build.sh
index b9f2596..6cf46ce 100644
--- a/ports/ci/windows-msys/build.sh
+++ b/ports/ci/windows-msys/build.sh
@@ -26,7 +26,7 @@ else
     COMPILER_CXX=g++
 fi
 
-if [ -z "${DISABLE_CCACHE}" ]; then
+if [ "${DISABLE_CCACHE}" != 1 ]; then
     EXTRA_PARAMS="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache"
 fi