]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
github: export CC and CXX
authorKarel Zak <kzak@redhat.com>
Tue, 26 Jan 2021 10:56:33 +0000 (11:56 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 26 Jan 2021 10:56:33 +0000 (11:56 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
.github/workflows/cibuild-setup-ubuntu.sh
.github/workflows/cibuild.sh

index e3c1322eef77d9887fc39a30fc4da59c64a3538f..4188d7cc243116b03ba08b63f3724d18e4f6209b 100755 (executable)
@@ -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[@]}"
index e717b16bfce53b5c7b51a843971c1735f8275e44..a2dfa34083da5372f45d60d4ad3bfb4ed2693aff 100755 (executable)
@@ -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