[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: gccgo-12: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
02/03: gnu: gccgo-12: Fix building on riscv64-linux. |
Date: |
Thu, 30 May 2024 08:10:24 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 86cab5c4bc436e1900bbc697eb12fbc177df24d6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu May 30 12:10:17 2024 +0300
gnu: gccgo-12: Fix building on riscv64-linux.
* gnu/packages/gcc.scm (make-gccgo)[arguments]: When building gccgo-12
for riscv64-linux don't add a phase to adjust the order of libgo
dependencies.
Change-Id: I600c744ce33ad802a5c466c19df41dcbb29a2be0
---
gnu/packages/gcc.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index c08c6521d6..0060ff7518 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1214,7 +1214,12 @@ provides the GNU compiler for the Go programming
language.")
(substitute-keyword-arguments (package-arguments gccgo)
((#:phases phases)
#~(modify-phases #$phases
- #$@(if (version>=? (package-version gccgo) "12.0")
+ #$@(if (and (version>=? (package-version gccgo) "12.0")
+ ;; This somehow breaks gccgo@12 on riscv64-linux.
+ (not (and (target-riscv64?)
+ (string=? (version-prefix
+ (package-version gccgo) 1)
+ "12"))))
#~((add-after 'unpack 'adjust-libgo-dependencies
(lambda _
(substitute* "Makefile.in"