[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/11: build/go: Don't use set!
From: |
guix-commits |
Subject: |
07/11: build/go: Don't use set! |
Date: |
Tue, 14 May 2024 07:53:26 -0400 (EDT) |
sharlatan pushed a commit to branch go-team
in repository guix.
commit d16ea3260680f685943fc1e8724f81e5e6af6e1d
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Nov 28 12:24:15 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
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
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)
- branch go-team created (now 3c59a78345), guix-commits, 2024/05/14
- 01/11: gnu: Add go-1.22 and its standard library., guix-commits, 2024/05/14
- 05/11: gnu: Remove go-etcd-io-bbolt., guix-commits, 2024/05/14
- 08/11: build/go: Use trimpath go flag., guix-commits, 2024/05/14
- 04/11: gnu: go-go-etcd-io-bbolt: Move to (gnu packages golang-xyz)., guix-commits, 2024/05/14
- 06/11: gnu: Remove go-golang-org-x-net-html., guix-commits, 2024/05/14
- 09/11: gnu: go-1.22: Update to 1.22.1., guix-commits, 2024/05/14
- 02/11: gnu: Remove go-1.14., guix-commits, 2024/05/14
- 03/11: gnu: Add go-go-etcd-io-gofail., guix-commits, 2024/05/14
- 07/11: build/go: Don't use set!,
guix-commits <=
- 10/11: gnu: go-1.22: Update to 1.22.2., guix-commits, 2024/05/14
- 11/11: gnu: go-1.22: Disable flakey tests., guix-commits, 2024/05/14