diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-03 13:15:04 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:11 +0200 |
| commit | 60d0c87b6e3723c5f9ebff6108fd375bdc928e9d (patch) | |
| tree | f06f12c600fd3489ab95811a1ca8d4c8dcb835c3 | |
| parent | cbd17257aaa3b589bdb21857ded56ef1f2d3978c (diff) | |
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.
| -rw-r--r-- | gnu/packages/commencement.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7911a12d8d..9d2b4e6fe8 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" |