diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-11-11 09:45:29 +0100 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-03 08:39:01 +0100 |
| commit | be81d464728cf95e015e5a89a833d9d464d39442 (patch) | |
| tree | 6bc3131f4c675821a46fd4ad651e99ca290fc12c | |
| parent | 013b1143a5cf646a535b7f498cae1856aadf8cb3 (diff) | |
| download | guix-be81d464728cf95e015e5a89a833d9d464d39442.tar guix-be81d464728cf95e015e5a89a833d9d464d39442.tar.gz | |
gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0.
* gnu/packages/commencement.scm (libstdc++-boot0-gcc7): Change variable to...
(make-libstdc++-boot0): ...this new procedure and update accordingly.
(gcc-boot0): Update accordingly, and cater for x86_64-gnu.
Change-Id: Ib0bc84e4dab90b080e5a01e6ab932f8be456c656
| -rw-r--r-- | gnu/packages/commencement.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ad70bae501..a14de3002f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2273,9 +2273,9 @@ exec " gcc "/bin/" program (inputs (%boot0-inputs)) (native-inputs '())))) -(define libstdc++-boot0-gcc7 +(define (make-libstdc++-boot0 gcc) ;; GCC >= 7 is needed by architectures which use C++-14 features. - (let ((lib (make-libstdc++ gcc-7))) + (let ((lib (make-libstdc++ gcc))) (package (inherit lib) (source (bootstrap-origin (package-source lib))) @@ -2446,7 +2446,8 @@ exec " gcc "/bin/" program ;; The libstdc++ that libcc1 links against. ("libstdc++" ,(match (%current-system) - ("riscv64-linux" libstdc++-boot0-gcc7) + ("riscv64-linux" (make-libstdc++-boot0 gcc-7)) + ("x86_64-gnu" (make-libstdc++-boot0 gcc-14)) (_ libstdc++-boot0))) ;; Call it differently so that the builder can check whether |