01/03: build/go: Don't use set!

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 0a4b6fd51a2a4f87cbd85019db07984fd37096d7
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Nov 28 12:22:02 2023 +0200

    build/go: Don't use set!
    
    This causes build failures on powerpc-linux.
    
    * guix/build/go-build-system.scm (unpack): When the unpack-path is unset
    use the import-path but don't redefine the unpack-path.
    
    Change-Id: I2b5a36eb738abb14307941d388038139dbaf2bdf
---
 guix/build/go-build-system.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm
index 7f25e05d0d..bba05fd8c9 100644
--- a/guix/build/go-build-system.scm
+++ b/guix/build/go-build-system.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
-;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -227,9 +227,10 @@ unpacking."
 
   (when (string-null? import-path)
     (display "WARNING: The Go import path is unset.\n"))
-  (when (string-null? unpack-path)
-    (set! unpack-path import-path))
-  (let ((dest (string-append (getenv "GOPATH") "/src/" unpack-path)))
+  (let ((dest (string-append (getenv "GOPATH") "/src/"
+                             (if (string-null? unpack-path)
+                                 import-path
+                                 unpack-path))))
     (mkdir-p dest)
     (if (file-is-directory? source)
         (copy-recursively source dest #:keep-mtime? #t)