branch master updated: Revert "build/go: Don't use set!"

[guix-commits]

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

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1d2d6aaeaf Revert "build/go: Don't use set!"
1d2d6aaeaf is described below

commit 1d2d6aaeaf26b5db1e330466b6dd083415ec623a
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Dec 4 13:19:53 2023 +0200

    Revert "build/go: Don't use set!"
    
    This causes too many rebuilds.
    
    This reverts commit 0a4b6fd51a2a4f87cbd85019db07984fd37096d7.
---
 guix/build/go-build-system.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm
index bba05fd8c9..7f25e05d0d 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, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -227,10 +227,9 @@ unpacking."
 
   (when (string-null? import-path)
     (display "WARNING: The Go import path is unset.\n"))
-  (let ((dest (string-append (getenv "GOPATH") "/src/"
-                             (if (string-null? unpack-path)
-                                 import-path
-                                 unpack-path))))
+  (when (string-null? unpack-path)
+    (set! unpack-path import-path))
+  (let ((dest (string-append (getenv "GOPATH") "/src/" unpack-path)))
     (mkdir-p dest)
     (if (file-is-directory? source)
         (copy-recursively source dest #:keep-mtime? #t)