bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-29 12:41:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: binutils-boot0: Refactor arguments."

Browse source 
This reverts commit 6f229017f5.
This commit is contained in:
Maxim Cournoyer 2025-10-30 16:20:01 +09:00
parent 63d395cf61
commit 4801cb6f8f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
gnu/packages/commencement.scm
View file

@ -2248,40 +2248,40 @@ exec " gcc "/bin/" program
(source (bootstrap-origin (package-source binutils)))
(name "binutils-cross-boot0")
(arguments
(ensure-keyword-arguments
(substitute-keyword-arguments (package-arguments binutils)
((#:modules modules '((guix build gnu-build-system)
(guix build utils)))
(cons '(ice-9 ftw) modules))
((#:configure-flags cf ''())
#~(append (list #$(string-append "--target="
(boot-triplet))
"--disable-gprofng") ;requires Bison
#$cf))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
(add-after 'install 'add-symlinks
(lambda* (#:key outputs #:allow-other-keys)
;; The cross-gcc invokes 'as', 'ld', etc, without the
;; triplet prefix, so add symlinks.
(let ((out (assoc-ref outputs "out"))
(triplet-prefix (string-append #$(boot-triplet)
"-")))
(define (has-triplet-prefix? name)
(string-prefix? triplet-prefix name))
(define (remove-triplet-prefix name)
(substring name
(string-length triplet-prefix)))
(append (list #:guile %bootstrap-guile
#:implicit-inputs? #f
(with-directory-excursion (string-append out "/bin")
(for-each (lambda (name)
(symlink name
(remove-triplet-prefix name)))
(scandir "."
has-triplet-prefix?)))))))))
(list #:guile %bootstrap-guile
#:implicit-inputs? #f)))
(native-inputs '()) ;no Bison
#:modules '((guix build gnu-build-system)
(guix build utils)
(ice-9 ftw)) ; for 'scandir'
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'add-symlinks
(lambda* (#:key outputs #:allow-other-keys)
;; The cross-gcc invokes 'as', 'ld', etc, without the
;; triplet prefix, so add symlinks.
(let ((out (assoc-ref outputs "out"))
(triplet-prefix (string-append #$(boot-triplet)
"-")))
(define (has-triplet-prefix? name)
(string-prefix? triplet-prefix name))
(define (remove-triplet-prefix name)
(substring name
(string-length triplet-prefix)))
(with-directory-excursion (string-append out "/bin")
(for-each (lambda (name)
(symlink name
(remove-triplet-prefix name)))
(scandir "."
has-triplet-prefix?))))))))
(substitute-keyword-arguments (package-arguments binutils)
((#:configure-flags cf)
#~(append (list #$(string-append "--target="
(boot-triplet))
"--disable-gprofng") ;requires Bison
#$cf)))))
(native-inputs '()) ;no Bison
(inputs (%boot0-inputs))))
(define libstdc++-boot0