guix-commits
[Top][All Lists]
Advanced

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

01/04: gnu: go-1.14: Fix building on some platforms.


From: guix-commits
Subject: 01/04: gnu: go-1.14: Fix building on some platforms.
Date: Sun, 12 Dec 2021 08:20:03 -0500 (EST)

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

commit 8226771a337df104e3c6a7cb123a968e1226a619
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 12 11:53:38 2021 +0200

    gnu: go-1.14: Fix building on some platforms.
    
    * gnu/packages/golang.scm (go-1.14)[arguments]: In custom 'prebuild
    phase also search for loader without 'linux' in the string. In custom
    'build phase set the GOCACHE directory.
    [native-inputs]: On systems which don't have support in go-1.4 use
    gccgo-10 instead.
---
 gnu/packages/golang.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 41f4d1d..e546922 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -272,7 +272,8 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") 
"/lib"))
                       (ld (string-append (assoc-ref inputs "libc") "/lib"))
-                      (loader (car (find-files ld "^ld-linux.+")))
+                      (loader (car (append (find-files ld "^ld-linux.+")
+                                           (find-files ld "^ld(64)?\\.so.+"))))
                       (net-base (assoc-ref inputs "net-base"))
                       (tzdata-path
                        (string-append (assoc-ref inputs "tzdata") 
"/share/zoneinfo"))
@@ -409,6 +410,7 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
                  (setenv "GOOS" "linux")
                  (setenv "GOROOT" (dirname (getcwd)))
                  (setenv "GOROOT_FINAL" output)
+                 (setenv "GOCACHE" "/tmp/go-cache")
                  (setenv "CGO_ENABLED" "1")
                  (invoke "sh" "all.bash"))))
            (replace 'install
@@ -447,7 +449,9 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
                  (copy-recursively "../" output)
                  #t)))))))
     (native-inputs
-     `(("go" ,go-1.4)
+     `(,@(if (member (%current-system) (package-supported-systems go-1.4))
+           `(("go" ,go-1.4))
+           `(("go" ,gccgo-10)))
        ("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch"))
        ,@(match (%current-system)
            ((or "armhf-linux" "aarch64-linux")



reply via email to

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