From: Karel Zak <kzak@redhat.com>
Date: Tue, 26 Jan 2021 10:56:33 +0000 (+0100)
Subject: github: export CC and CXX
X-Git-Tag: v2.37-rc1~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=025c43dfe11e0bbb742ca04eeaf7e026279e61dc;p=thirdparty%2Futil-linux.git

github: export CC and CXX

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/.github/workflows/cibuild-setup-ubuntu.sh b/.github/workflows/cibuild-setup-ubuntu.sh
index e3c1322eef..4188d7cc24 100755
--- a/.github/workflows/cibuild-setup-ubuntu.sh
+++ b/.github/workflows/cibuild-setup-ubuntu.sh
@@ -36,15 +36,26 @@ if [[ "$COMPILER" == clang ]]; then
     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
     add-apt-repository -y "deb http://apt.llvm.org/$RELEASE/   llvm-toolchain-$RELEASE-$COMPILER_VERSION  main"
     PACKAGES+=(clang-$COMPILER_VERSION lldb-$COMPILER_VERSION lld-$COMPILER_VERSION clangd-$COMPILER_VERSION)
+    CC="clang-$COMPILER_VERSION"
+    CXX="clang++-$COMPILER_VERSION"
+    AR="llvm-ar-$COMPILER_VERSION"
 elif [[ "$COMPILER" == gcc ]]; then
     # Latest gcc stack deb packages provided by
     # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
     add-apt-repository -y ppa:ubuntu-toolchain-r/test
     PACKAGES+=(gcc-$COMPILER_VERSION)
+    CC="gcc-$COMPILER_VERSION"
+    CXX="g++-$COMPILER_VERSION"
+    AR="gcc-ar-$COMPILER_VERSION"
 else
     fatal "Unknown compiler: $COMPILER"
 fi
 
+export CC
+export CXX
+export AR
+
+
 apt-get -y update --fix-missing
 apt-get -y build-dep util-linux
 apt-get -y install "${PACKAGES[@]}"
diff --git a/.github/workflows/cibuild.sh b/.github/workflows/cibuild.sh
index e717b16bfc..a2dfa34083 100755
--- a/.github/workflows/cibuild.sh
+++ b/.github/workflows/cibuild.sh
@@ -23,7 +23,7 @@ for phase in "${PHASES[@]}"; do
 		sudo -E git clean -xdf
 
 		./autogen.sh
-		./configure $opts
+		CC=$CC CXX=$CXX ./configure $opts
 		;;
         MAKE)
 		make -j