scripts: gha: fix cross compilers paths

Author: a1batross

.github/workflows/c-cpp.yml

@@ -41,7 +41,6 @@ jobs:
       YQ_VERSION: 4.44.6
 #      WAFCACHE: ~/wafcache
       WAFCACHE_STATS: 1
-      MSVC_WINE_PATH: /home/runner/msvc
       GH_CPU_OS: ${{ matrix.targetos }}
       GH_CPU_ARCH: ${{ matrix.targetarch }}
     steps:

scripts/gha/build_common.sh

@@ -23,7 +23,7 @@ build_with_waf()
 		python waf --help | grep 'enable-vgui' && WAF_ENABLE_VGUI_OPTION=--enable-vgui
 	fi
 
-	if [ "$MSVC_WINE" -ne 0 ]; then
+	if [ -n "$MSVC_WINE_PATH" ]; then
 		WAF_ENABLE_MSVC_WINE=--enable-msvc-wine
 	fi
 

scripts/gha/self-hosted/build_linux.sh

@@ -5,8 +5,8 @@ declare -A TOOLCHAINS
 
 TOOLCHAINS[i386]=/home/runner/x-tools/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-
 TOOLCHAINS[amd64]=/home/runner/x-tools/x86_64-unknown-linux-gnu/bin/x86_64-unknown-linux-gnu-
-TOOLCHAINS[arm64]=/home/runner/x-tools/arm64-unknown-linux-gnu/bin/arm64-unknown-linux-gnu-
-TOOLCHAINS[armhf]=/home/runner/x-tools/armhf-unknown-linux-gnu/bin/armhf-unknown-linux-gnu-
+TOOLCHAINS[arm64]=/home/runner/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-
+TOOLCHAINS[armhf]=/home/runner/x-tools/arm-unknown-linux-gnueabihf/bin/arm-unknown-linux-gnueabihf-
 
 export CROSS_COMPILE=${TOOLCHAINS[$GH_CPU_ARCH]}
 

scripts/gha/self-hosted/build_win32.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-MSVC_WINE=1
+export MSVC_WINE_PATH=/home/runner/msvc
 
 source scripts/gha/build_common.sh