ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: go-1.17: Build with gcc:lib on arm* architectures.

Browse source 
* gnu/packages/golang.scm (go-1.17)[arguments]: Add phase on arm*
architectures to link to gcc:lib.
[inputs]: When building for arm* don't remove gcc:lib.
This commit is contained in:
Efraim Flashner 2021-12-21 18:21:53 +02:00
parent 7ccfec3065
commit 8f85e4f9aa
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/golang.scm
View file

@ -685,6 +685,29 @@ (define-public go-1.17
(string-append net-base "/etc/services")))
(substitute* "src/time/zoneinfo_unix.go"
(("/usr/share/zoneinfo/") tzdata-path)))))
;; Keep this synchronized with the package inputs.
,@(if (target-arm?)
'((add-after 'unpack 'patch-gcc:lib
(lambda* (#:key inputs #:allow-other-keys)
(let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")))
;; Add libgcc to runpath
(substitute* "src/cmd/link/internal/ld/lib.go"
(("!rpath.set") "true"))
(substitute* "src/cmd/go/internal/work/gccgo.go"
(("cgoldflags := \\[\\]string\\{\\}")
(string-append "cgoldflags := []string{"
"\"-Wl,-rpath=" gcclib "\""
"}"))
(("\"-lgcc_s\", ")
(string-append
"\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", ")))
(substitute* "src/cmd/go/internal/work/gc.go"
(("ldflags = setextld\\(ldflags, compiler\\)")
(string-append
"ldflags = setextld(ldflags, compiler)\n"
"ldflags = append(ldflags, \"-r\")\n"
"ldflags = append(ldflags, \"" gcclib "\")\n")))))))
'())
(add-after 'patch-source 'disable-failing-tests
(lambda _
;; Disable failing tests: these tests attempt to access
@ -796,7 +819,9 @@ (define-public go-1.17
(install-file file (string-append out "/share/doc/go")))
'("AUTHORS" "CONTRIBUTORS" "CONTRIBUTING.md" "PATENTS"
"README.md" "SECURITY.md"))))))))
(inputs (alist-delete "gcc:lib" (package-inputs go-1.16)))
(inputs (if (not (target-arm?))
(alist-delete "gcc:lib" (package-inputs go-1.16))
(package-inputs go-1.16)))
(native-inputs
(if (not (member (%current-system) (package-supported-systems go-1.4)))
;; gccgo-10.4, 11.3 and lower has a bug which causes bootstrapping