guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/17: gnu: commencement: Avoid cyclic dependency when targeting i586-pc


From: guix-commits
Subject: 01/17: gnu: commencement: Avoid cyclic dependency when targeting i586-pc-gnu.
Date: Sat, 25 Nov 2023 17:36:15 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 625a847d2a554168bec6e294888d9d1f8ab03d08
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Nov 25 22:47:10 2023 +0100

    gnu: commencement: Avoid cyclic dependency when targeting i586-pc-gnu.
    
    Fixes a regression introduced in
    95ea1277ae2ebd278bdb51a7887f5ba1116fbc64 where:
    
      guix build coreutils --target=i586-pc-gnu coreutils
    
    would never complete due to a dependency loop introduced in
    ‘%final-inputs’.
    
    * gnu/packages/commencement.scm (%final-inputs): Pass argument to
    ‘target-hurd?’.
    
    Change-Id: I4df7907fb9afcd2b170ba19307666eaa81f12d41
---
 gnu/packages/commencement.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a1ee015d04..03fecd6d9b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3496,7 +3496,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
           ("gcc" ,gcc-final)
           ("libc" ,glibc-final)
           ("libc:static" ,glibc-final "static")
-          ("locales" ,(if (target-hurd?)
+          ("locales" ,(if (target-hurd? (%current-system))
                           glibc-utf8-locales-final/hurd
                           glibc-utf8-locales-final)))))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]