me
/
guix
Archived
1
0
Fork 0
Code

build-system/copy: Avoid use of 'set!'. 

This fixes the copy-build-system on powerpc-linux.

* guix/build/copy-build-system.scm (install)[install]: Don't clobber
'target' variable and move variable assignation into the let statement.
master
Efraim Flashner 2021-04-26 11:56:24 +03:00
parent 145eba0965
commit d7653761d3
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/build/copy-build-system.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -133,8 +134,8 @@ given, then the predicate always returns DEFAULT-VALUE."
file-list))))
(define* (install source target #:key include exclude include-regexp exclude-regexp)
(set! target (string-append (assoc-ref outputs "out") "/" target))
(let ((filters? (or include exclude include-regexp exclude-regexp)))
(let ((final-target (string-append (assoc-ref outputs "out") "/" target))
(filters? (or include exclude include-regexp exclude-regexp)))
(when (and (not (file-is-directory? source))
filters?)
(error "Cannot use filters when SOURCE is a file."))
@ -143,12 +144,12 @@ given, then the predicate always returns DEFAULT-VALUE."
(and (file-is-directory? source)
filters?))))
(if multi-files-in-source?
(install-file-list source target
(install-file-list source final-target
#:include include
#:exclude exclude
#:include-regexp include-regexp
#:exclude-regexp exclude-regexp)
(install-simple source target)))))
(install-simple source final-target)))))
(for-each (lambda (plan) (apply install plan)) install-plan)
#t)