guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates updated: build-system/copy: Avoid use of 'set!'.


From: guix-commits
Subject: branch core-updates updated: build-system/copy: Avoid use of 'set!'.
Date: Tue, 04 May 2021 11:34:13 -0400

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new d765376  build-system/copy: Avoid use of 'set!'.
d765376 is described below

commit d7653761d35a86e3fc2e654fe5815a0d227326db
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Apr 26 11:56:24 2021 +0300

    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.
---
 guix/build/copy-build-system.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm
index ac4a62a..fb2d1db 100644
--- a/guix/build/copy-build-system.scm
+++ b/guix/build/copy-build-system.scm
@@ -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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]