From 1511c489c5bd9458f01d16a1ac3f8fd02c8b1d63 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Mon, 20 Apr 2026 16:54:52 +0200 Subject: [PATCH] guix: add initial loongarch64 support --- contrib/depends/.gitignore | 1 + contrib/depends/toolchain.cmake.in | 2 +- contrib/guix/libexec/build.sh | 1 + contrib/guix/manifest.scm | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/depends/.gitignore b/contrib/depends/.gitignore index df595042c..52aff4f17 100644 --- a/contrib/depends/.gitignore +++ b/contrib/depends/.gitignore @@ -9,3 +9,4 @@ mips* arm* aarch64* riscv64* +loongarch64* diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 76de10119..6c3e39d12 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -163,7 +163,7 @@ if(ARCHITECTURE STREQUAL "riscv64") endif() if(ARCHITECTURE STREQUAL "loongarch64") set(ARCH_ID "loongarch64") - set(ARCH "loongarch") + set(ARCH "loongarch64") endif() if(ARCHITECTURE STREQUAL "i686") diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index a66ee8138..b34f72613 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -199,6 +199,7 @@ case "$HOST" in aarch64-linux-gnu) echo /lib/ld-linux-aarch64.so.1 ;; riscv64-linux-gnu) echo /lib/ld-linux-riscv64-lp64d.so.1 ;; i686-linux-gnu) echo /lib/ld-linux.so.2 ;; + loongarch64-linux-gnu) echo /lib64/ld-linux-loongarch-lp64d.so.1 ;; *) exit 1 ;; esac ) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 86fd54844..03963d9cb 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -276,7 +276,9 @@ chain for " target " development.")) (list gcc-toolchain-14 (list gcc-toolchain-14 "static") - (make-monero-cross-toolchain target))) + (if (string-contains target "loongarch64") + (make-monero-cross-toolchain target #:base-libc glibc) + (make-monero-cross-toolchain target)))) ((string-contains target "freebsd") (list xz ; used to unpack freebsd_base