diff mbox series

[bug#78083,1/4] gnu: Add gcc-15.

Message ID 81517d29a691f3306abc17b1cfb212d0e23d8f0d.1745660337.git.z572@z572.online
State New
Headers
Series gcc 15 |

Commit Message

Zheng Junjie April 27, 2025, 9:16 a.m. UTC 
  * gnu/packages/gcc.scm (gcc-15): New variable.

Change-Id: I55e49e61626e8419ac936d1c5d241a586eaca47f
---
 gnu/packages/gcc.scm | 47 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 36783af37da..53da86aac00 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -13,7 +13,7 @@ 
 ;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
-;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024, 2025 Zheng Junjie <z572@z572.online>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org>
@@ -856,6 +856,51 @@  (define-public gcc-14
         ("x86_64" ,@%gcc-14-x86_64-micro-architectures))
        ,@(package-properties gcc-11)))))
 
+(define-public gcc-15
+  (package
+    (inherit gcc-14)
+    (version "15.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/gcc/gcc-"
+                                  version "/gcc-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1skcy1a3wwb8k25f9l1qy11nj8b5089f05dpzzn1zw302v19xc72"))
+              (patches (search-patches "gcc-12-strmov-store-file-names.patch"
+                                       "gcc-5.0-libvtv-runpath.patch"))
+              (modules '((guix build utils)))
+              (snippet gcc-canadian-cross-objdump-snippet)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments gcc-14)
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            (add-after 'install 'adjust-modules-file
+              ;; Avoid cycle dependencies
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let ((lib (assoc-ref outputs "lib"))
+                      (out (assoc-ref outputs "out")))
+                  (when lib
+                    (let ((modfile (string-append
+                                    lib "/lib/libstdc++.modules.json"))
+                          (origin (string-append out "/include/c++/bits"))
+                          (modpath (string-append lib "/include/c++/bits")))
+
+                      (for-each (lambda (file) (install-file file modpath))
+                                (find-files origin "\\.cc$"))
+                      (substitute* modfile
+                        ;; Relative path to out output
+                        (("\\.\\./\\.\\./.*/include")
+                         (string-append lib "/include"))))))))))))
+    (properties
+     `((compiler-cpu-architectures
+        ("aarch64" ,@%gcc-13-aarch64-micro-architectures)
+        ("armhf" ,@%gcc-13-armhf-micro-architectures)
+        ("i686" ,@%gcc-13-x86_64-micro-architectures)
+        ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures)
+        ("x86_64" ,@%gcc-14-x86_64-micro-architectures))
+       ,@(package-properties gcc-11)))))
+
 
 ;; Note: When changing the default gcc version, update
 ;;       the gcc-toolchain-* definitions.