~ruther/guix-local

0a4b6fd51a2a4f87cbd85019db07984fd37096d7 — Efraim Flashner 2 years ago 6e2dd51
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
1 files changed, 5 insertions(+), 4 deletions(-)

M guix/build/go-build-system.scm
M guix/build/go-build-system.scm => guix/build/go-build-system.scm +5 -4
@@ 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)