From cb2e5f316c442ac0528980f5204d0afa45d030ac Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sun, 21 Aug 2022 20:52:04 +0200
Subject: [PATCH] Revert "Maybe make it possible"

This reverts commit a517d9d65fcd6646944d45d295284edf3c87cf99.
---
 docker/packager/binary/Dockerfile | 9 ---------
 docker/packager/packager          | 4 ++--
 tests/ci/ci_config.py             | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 67e61f2036b..74919bb2100 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -44,15 +44,6 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
 # A cross-linker for RISC-V 64 (we need it, because LLVM's LLD does not work):
 RUN apt-get install binutils-riscv64-linux-gnu
 
-# Build LLVM from trunk, because only that version can build the RISC-V binaries successfully.
-# It can be also used to check it for regular builds.
-RUN git clone git@github.com:llvm/llvm-project.git \
-    && mkdir llvm-build \
-    && cd llvm-build \
-    && cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DLLVM_ENABLE_PROJECTS=all -DLLVM_TARGETS_TO_BUILD=all ../llvm-project/llvm \
-    && ninja \
-    && ninja install
-
 # Architecture of the image when BuildKit/buildx is used
 ARG TARGETARCH
 ARG NFPM_VERSION=2.16.0
diff --git a/docker/packager/packager b/docker/packager/packager
index 03f3bd80c96..3769e321ccc 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -189,7 +189,7 @@ def parse_env_variables(
             "-DCMAKE_TOOLCHAIN_FILE=/build/cmake/linux/toolchain-ppc64le.cmake"
         )
     elif is_cross_riscv:
-        cc = "clang"
+        cc = compiler[: -len(RISCV_SUFFIX)]
         cmake_flags.append(
             "-DCMAKE_TOOLCHAIN_FILE=/build/cmake/linux/toolchain-riscv64.cmake"
         )
@@ -346,7 +346,7 @@ if __name__ == "__main__":
             "clang-14-darwin-aarch64",
             "clang-14-aarch64",
             "clang-14-ppc64le",
-            "clang-trunk-riscv64",
+            "clang-14-riscv64",
             "clang-14-freebsd",
             "gcc-11",
         ),
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index aa5762d7536..7110ff628ad 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -178,7 +178,7 @@ CI_CONFIG = {
             "with_coverage": False,
         },
         "binary_riscv64": {
-            "compiler": "clang-trunk-riscv64",
+            "compiler": "clang-14-riscv64",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",