From 769df3512cfdbf5bbb6e71e8f9850597f5cc7d16 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 17 Dec 2024 09:23:22 +0200
Subject: gnu: gcc-muslboot: Use full gcc sources.

* gnu/packages/commencement.scm (gcc-muslboot)[source]: Use the full gcc
sources, not gcc-core.
[native-inputs]: Remove the gcc-g++ sources.
[arguments]: Remove custom phase unpacking the gcc-g++ sources.

Change-Id: Ib574db2e2c92db693b0fd8d90d6d248976b0fa19
---
 gnu/packages/commencement.scm | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9404da42643..88bfa5b9f70 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2032,18 +2032,17 @@ ac_cv_c_float_format='IEEE (little-endian)'
     (inherit gcc-muslboot0)
     (name "gcc-muslboot")
     (version "4.6.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/gcc/gcc-"
+                                  version "/gcc-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0vvkzxi8wvaj9wzdk0hv12nj9kqymkpjqzasj2ri8nc107dk7pjk"))))
     (native-inputs
-     `(("gcc-g++"
-        ,(origin
-           (method url-fetch)
-           (uri (string-append "mirror://gnu/gcc/gcc-"
-                               version "/gcc-g++-" version ".tar.gz"))
-           (sha256
-            (base32
-             "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9"))))
-       ,@(modify-inputs (%boot-tcc-musl-inputs)
-                        (replace "gcc" gcc-muslboot0)
-                        (replace "libc" musl-boot))))
+     (modify-inputs (%boot-tcc-musl-inputs)
+                    (replace "gcc" gcc-muslboot0)
+                    (replace "libc" musl-boot)))
     (arguments
      (substitute-keyword-arguments (package-arguments gcc-muslboot0)
        ((#:configure-flags configure-flags)
@@ -2057,10 +2056,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
                  #$configure-flags))))
        ((#:phases phases)
         #~(modify-phases #$phases
-            (add-before 'unpack 'unpack-g++
-              (lambda _
-                (let ((source-g++ (assoc-ref %build-inputs "gcc-g++")))
-                  (invoke "tar" "xvf" source-g++))))
             (add-after 'apply-riscv64-patch 'apply-second-riscv64-patch
               (lambda* (#:key inputs #:allow-other-keys)
                 (let ((patch-file
-- 
cgit v1.2.3