From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 29 Jan 2021 18:00:56 +0000 (+0100)
Subject: ci: use the correct compiler version
X-Git-Tag: v2.37-rc1~139^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0388289e3aedf554ee795f0b641ca01a903a0304;p=thirdparty%2Futil-linux.git

ci: use the correct compiler version
---

diff --git a/.github/workflows/cibuild.sh b/.github/workflows/cibuild.sh
index 8256be9650..80583c5136 100755
--- a/.github/workflows/cibuild.sh
+++ b/.github/workflows/cibuild.sh
@@ -2,14 +2,14 @@
  
 PHASES=(${@:-CONFIGURE MAKE INSTALL CHECK DISTCHECK})
 COMPILER="${COMPILER:?}"
-COMPILER_VERSION="${COMPILER_VERSION:?}"
+COMPILER_VERSION="${COMPILER_VERSION}"
 
 if [[ "$COMPILER" == clang ]]; then
-    CC="clang"
-    CXX="clang++"
+    CC="clang${COMPILER_VERSION:+-$COMPILER_VERSION}"
+    CXX="clang++${COMPILER_VERSION:+-$COMPILER_VERSION}"
 elif [[ "$COMPILER" == gcc ]]; then
-    CC="gcc"
-    CXX="g++"
+    CC="gcc${COMPILER_VERSION:+-$COMPILER_VERSION}"
+    CXX="g++${COMPILER_VERSION:+-$COMPILER_VERSION}"
 fi
 
 set -ex
@@ -28,7 +28,7 @@ for phase in "${PHASES[@]}"; do
 			--without-python \
 			--enable-werror"
 
-		if [[ "$COMPILER" == clang ]]; then
+		if [[ "$COMPILER" == clang* ]]; then
 			opts="$opts --enable-fuzzing-engine"
 		fi