From 845e9e3cb743fa2b58c3d3dcee04c26027935f2b Mon Sep 17 00:00:00 2001 From: Username404 Date: Fri, 25 Nov 2022 19:44:34 +0100 Subject: [PATCH] Revert "Jenkinsfile: Use glibc when compiling for riscv64 since the riscv64 cross-compiler doesn't seem to work" This reverts commit 6afec609 Signed-off-by: Username404 --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8066c55..c1e6b99 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,8 +7,7 @@ boolean use_yarn_or_npm() { return fileExists('/usr/bin/yarn') || fileExists('/u - Sidebar Link - Workspace Cleanup Required Compilers: - - G++ cross-compiler for riscv64 - - Musl cross-compiling toolchains (archives ending in "-cross" from https://musl.cc/#binaries) for x86_64, i686, armel, armhf and aarch64, unzipped into /usr/, along with soft links from /usr/bin/ to the binaries + - Musl cross-compiling toolchains (archives ending in "-cross" from https://musl.cc/#binaries) for x86_64, i686, armel, armhf, aarch64 and riscv64, unzipped into /usr/, along with soft links from /usr/bin/ to the binaries - Emscripten Clang (https://github.com/emscripten-core/emsdk) in /usr/share/ - MinGW32 G++/Clang (https://github.com/mstorsjo/llvm-mingw) for x86_64, i686, armhf and aarch64, (unzip the content of the folder in the tar.xz file) in /usr/, along with soft links from /usr/bin/ to the binaries Optional Tools: @@ -44,7 +43,7 @@ pipeline { 'armel-linux-musleabi (RPM=armv4l, DEB=armel)', 'armv7l-linux-musleabihf (RPM=armv7hl, DEB=armhf)', 'aarch64-linux-musl (RPM=aarch64, DEB=arm64)', - 'riscv64-linux-gnu (RPM=riscv64, DEB=riscv64)', + 'riscv64-linux-musl (RPM=riscv64, DEB=riscv64)', 'x86_64-w64-mingw32 (RPM=x86_64, DEB=amd64)', 'i686-w64-mingw32 (RPM=i386, DEB=i386)', 'armv7-w64-mingw32 (RPM=armv7hl, DEB=armhf)',