From 82df357bb2b40f4053534e8fb5697daae47f3b60 Mon Sep 17 00:00:00 2001 From: Yelninei Date: Fri, 9 Jan 2026 08:20:48 +0000 Subject: [PATCH] self: Link with libgc. guile-launcer.c uses libgc symbols on the Hurd. * guix/self.scm (%packages): Add libgc. (quiet-guile): Explicitly link with libgc. Change-Id: I3c2c098af53f8d552ed9ca412e5556a645080726 Signed-off-by: Maxim Cournoyer --- guix/self.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/self.scm b/guix/self.scm index 9552d3208f..ffe47f582f 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -52,6 +52,7 @@ `(gnu packages ,module)) variable))))) `(("guile" . ,(ref 'guile 'guile-3.0-latest)) + ("libgc" . ,(ref 'bdw-gc 'libgc)) ("guile-avahi" . ,(ref 'guile-xyz 'guile-avahi)) ("guile-json" . ,(ref 'guile 'guile-json-4)) ("guile-ssh" . ,(ref 'ssh 'guile-ssh)) @@ -564,6 +565,9 @@ instead of 'C'." (define gcc (specification->package "gcc-toolchain")) + (define libgc + (specification->package "libgc")) + (define source (search-path %load-path "gnu/packages/aux-files/guile-launcher.c")) @@ -597,6 +601,10 @@ instead of 'C'." "-L" #$(file-append guile "/lib") "-Wl,-rpath" #$(file-append guile "/lib") #$(string-append "-lguile-" effective) + ;; On the Hurd guile-launcher.c uses libgc symbols directly + "-L" #$(file-append libgc "/lib") + "-Wl,-rpath" #$(file-append libgc "/lib") + "-lgc" "-o" (string-append #$output "/bin/guile"))))) (computed-file "guile-wrapper" build))