janneke pushed a commit to branch core-packages-team
in repository guix.
commit e84e4ad4855abf62e39bf2ce9abc78d5f2f6a1a2
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Tue Dec 3 13:15:04 2024 +0100
gnu: commencement: gcc-final: Fix build for x86-linux with gcc-14.
Summary: Use fixes for the 64bit Hurd also on linux.
* gnu/packages/commencement.scm (gcc-final)[arguments]: When building for
x86-linux, create a gcc wrapper in phase "create-stage-wrapper", use it by
adding STAGE_CC_WRAPPER to #:make-flags, and CC to #:configure-flags to
convince configure gmp that gcc and g++ work.
---
gnu/packages/commencement.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 787555c78f..1f8e7d9de3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3274,7 +3274,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
"/lib -L" zlib "/lib -Wl,-rpath="
zlib "/lib")
flag))
- #$(if (target-hurd64?)
+ #$(if (or (target-hurd64?)
+ (and (target-x86?) (target-linux?)))
`(cons
(string-append
;;Convince gmp's configure that gcc works
@@ -3282,7 +3283,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
,flags)
flags))))
((#:configure-flags flags)
- (if (target-hurd64?)
+ (if (or (target-hurd64?)
+ (and (target-x86?) (target-linux?)))
#~(append
#$flags
(list #$(string-append
@@ -3336,7 +3338,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
#\:))
":")
"\nAM_CXXFLAGS = "))))))
- #$@(if (target-hurd64?)
+ #$@(if (or (target-hurd64?)
+ (and (target-x86?) (target-linux?)))
#~((add-after 'configure 'create-stage-wrapper
(lambda _
(with-output-to-file "gcc.sh"
