guix_mirror_bot pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 5ad92158580e19bd21a459408a54cfb93c0afe82
Author: Efraim Flashner <efr...@flashner.co.il>
AuthorDate: Tue Dec 17 09:19:52 2024 +0200
gnu: gcc-mesboot1: Use full gcc sources.
* gnu/packages/commencement.scm (gcc-mesboot1)[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: I4822bbf0385fc0bfb673ec834cc253d9465b0813
---
gnu/packages/commencement.scm | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 0e16c3fa1e..e177a1ec40 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1938,16 +1938,15 @@ ac_cv_c_float_format='IEEE (little-endian)'
(inherit gcc-core-mesboot1)
(name "gcc-mesboot1")
(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"))))
- ,@(package-native-inputs gcc-core-mesboot1)))
+ (package-native-inputs gcc-core-mesboot1))
(arguments
(substitute-keyword-arguments (package-arguments gcc-core-mesboot1)
((#:configure-flags configure-flags)
@@ -1958,10 +1957,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-before 'configure 'set-cplus-include-path
(lambda _
;; Set the C++ search path so that C headers can be found as
