amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: commencement: gcc-final: Fix build for x86-linux with gcc-14.

Browse source 
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.
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-03 13:15:04 +01:00 • committed by Andreas Enge
parent cbd17257aa
commit 60d0c87b6e
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/commencement.scm
View file

@ -3274,7 +3274,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
"/lib -L" zlib "/lib -Wl,-rpath=" "/lib -L" zlib "/lib -Wl,-rpath="
zlib "/lib") zlib "/lib")
flag)) flag))
#$(if (target-hurd64?) #$(if (or (target-hurd64?)
(and (target-x86?) (target-linux?)))
`(cons `(cons
(string-append (string-append
;;Convince gmp's configure that gcc works ;;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)
flags)))) flags))))
((#:configure-flags flags) ((#:configure-flags flags)
(if (target-hurd64?) (if (or (target-hurd64?)
(and (target-x86?) (target-linux?)))
#~(append #~(append
#$flags #$flags
(list #$(string-append (list #$(string-append
@ -3336,7 +3338,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
#\:)) #\:))
":") ":")
"\nAM_CXXFLAGS = ")))))) "\nAM_CXXFLAGS = "))))))
#$@(if (target-hurd64?) #$@(if (or (target-hurd64?)
(and (target-x86?) (target-linux?)))
#~((add-after 'configure 'create-stage-wrapper #~((add-after 'configure 'create-stage-wrapper
(lambda _ (lambda _
(with-output-to-file "gcc.sh" (with-output-to-file "gcc.sh"