TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnu: ld-wrapper: Build with Guile 2.2. 

Reported by Sergei Trofimovich <slyfox@inbox.ru>.

* gnu/packages/base.scm (make-ld-wrapper): Change #:guile to default to
GUILE-2.2.
* gnu/packages/commencement.scm (ld-wrapper): Define in terms of
'make-ld-wrapper' such that #:guile-for-build and #:guile are the same.
This commit is contained in:
Ludovic Courtès 2017-04-20 23:38:12 +02:00
parent a55fbab722
commit 78dea6f1d4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/base.scm
View File

@ -442,7 +442,7 @@ included.")
(define* (make-ld-wrapper name #:key (define* (make-ld-wrapper name #:key
(target (const #f)) (target (const #f))
binutils binutils
(guile (canonical-package guile-2.0)) (guile (canonical-package guile-2.2))
(bash (canonical-package bash)) (bash (canonical-package bash))
(guile-for-build guile)) (guile-for-build guile))
"Return a package called NAME that contains a wrapper for the 'ld' program "Return a package called NAME that contains a wrapper for the 'ld' program

10
gnu/packages/commencement.scm
View File

@ -842,12 +842,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define-public ld-wrapper (define-public ld-wrapper
;; The final 'ld' wrapper, which uses the final Guile and Binutils. ;; The final 'ld' wrapper, which uses the final Guile and Binutils.
(package (inherit ld-wrapper-boot3) (make-ld-wrapper "ld-wrapper"
(name "ld-wrapper") #:binutils binutils-final
(inputs `(("guile" ,guile-final) #:guile guile-final
("bash" ,bash-final) #:bash bash-final))
,@(fold alist-delete (package-inputs ld-wrapper-boot3)
'("guile" "bash"))))))
(define %boot5-inputs (define %boot5-inputs
;; Now with UTF-8 locales. Remember that the bootstrap binaries were built ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built