1 files changed, 12 insertions, 14 deletions

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 6161979e404..c1af2f71a44 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2031,13 +2031,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"))))
+    (source
+      (bootstrap-origin
+       (origin
+         (method url-fetch)
+         (uri (string-append "mirror://gnu/gcc/gcc-"
+                             version "/gcc-" version ".tar.gz"))
+         (sha256
+          (base32
+           "0vvkzxi8wvaj9wzdk0hv12nj9kqymkpjqzasj2ri8nc107dk7pjk"))
+         (patches (search-patches "gcc-boot-4.6.4-riscv64-support.patch"
+                                  "gcc-boot-4.6.4-riscv64-libstdc++-support.patch")))))
     (native-inputs
      (modify-inputs (%boot-tcc-musl-inputs)
                     (replace "gcc" gcc-muslboot0)
@@ -2068,13 +2072,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
       else
        _cpp_define_builtin (pfile, \"__cplusplus 199711L\");
     }")))))
-            (add-after 'apply-riscv64-patch 'apply-second-riscv64-patch
-              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((patch-file
-                        #$(local-file
-                            (search-patch
-                              "gcc-boot-4.6.4-riscv64-libstdc++-support.patch"))))
-                  (invoke "patch" "--force" "-p1" "-i" patch-file))))
+            (delete 'apply-riscv64-patch)
             (replace 'setenv
               (lambda _
                 (setenv "CC" "musl-gcc")