Maybe make it possible

This commit is contained in:
Alexey Milovidov 2022-08-15 04:23:56 +02:00
parent ec334a3a08
commit a517d9d65f
3 changed files with 12 additions and 3 deletions

View File

@ -44,6 +44,15 @@ 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

View File

@ -189,7 +189,7 @@ def parse_env_variables(
"-DCMAKE_TOOLCHAIN_FILE=/build/cmake/linux/toolchain-ppc64le.cmake"
)
elif is_cross_riscv:
cc = compiler[: -len(RISCV_SUFFIX)]
cc = "clang"
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-14-riscv64",
"clang-trunk-riscv64",
"clang-14-freebsd",
"gcc-11",
),

View File

@ -178,7 +178,7 @@ CI_CONFIG = {
"with_coverage": False,
},
"binary_riscv64": {
"compiler": "clang-14-riscv64",
"compiler": "clang-trunk-riscv64",
"build_type": "",
"sanitizer": "",
"package_type": "binary",