diff --git a/.github/workflows/build-and-upload.yml b/.github/workflows/build-and-upload.yml
index efa8f2f27e6..4d85c9433ba 100644
--- a/.github/workflows/build-and-upload.yml
+++ b/.github/workflows/build-and-upload.yml
@@ -173,7 +173,8 @@ jobs:
           CXX=${CC/#clang/clang++}
           echo "CC=$CC" >> $GITHUB_ENV
           echo "CXX=$CXX" >> $GITHUB_ENV
-          echo "AR=ar" >> $GITHUB_ENV
+          echo "CCLD=$CXX -fuse-ld=lld" >> $GITHUB_ENV
+          echo "AR=${CC/#clang/llvm-ar}" >> $GITHUB_ENV
         env:
           CC: ${{ matrix.compiler }}
         working-directory: ${{ runner.temp }}