From 2a972a30b9fcf743036bf9e81044e79854b62fde Mon Sep 17 00:00:00 2001 Message-Id: <2a972a30b9fcf743036bf9e81044e79854b62fde.1683465580.git.iyzsong@member.fsf.org> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 7 May 2023 21:15:20 +0800 Subject: [PATCH] gnu: Use dummy linker for systems without a 'linux' or 'gnu' suffix. * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Use dummy linker for systems without a 'linux' or 'gnu' suffix. --- gnu/packages/bootstrap.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 9a46f97c81..12a84b8265 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -323,19 +323,11 @@ (define* (glibc-dynamic-linker ((string=? system "powerpc64-linux") "/lib/ld64.so.1") ((string=? system "alpha-linux") "/lib/ld-linux.so.2") - ;; XXX: This one is used bare-bones, without a libc, so add a case - ;; here just so we can keep going. - ((string=? system "arm-elf") "no-ld.so") - ((string=? system "arm-eabi") "no-ld.so") - ((string=? system "xtensa-elf") "no-ld.so") - ((string=? system "avr") "no-ld.so") - ((string=? system "propeller-elf") "no-ld.so") - ((string=? system "i686-mingw") "no-ld.so") - ((string=? system "x86_64-mingw") "no-ld.so") - ((string=? system "vc4-elf") "no-ld.so") - - (else (error "dynamic linker name not known for this system" - system))))) + ((or (string-suffix? "-linux" system) (string-suffix? "-gnu" system)) + (error "dynamic linker name not known for this system" system)) + + ;; For bare-bones without a libc, eg: arm-elf, arm-eabi, xtensa-elf, etc. + (else "no-ld.so")))) ;;; base-commit: 7612610c44f16fc8f2ff395d9a2d58101a7356aa -- 2.39.2