diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-06-23 19:00:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-06-23 19:17:33 +0300 |
| commit | 9b03299544e540ad5975abb306c19eb0168aa5e1 (patch) | |
| tree | cc7cf0229c803fe032bcacff0eb51cea2ecbb016 /gnu/packages | |
| parent | 87e1a1979b2bc0fbcd6187483d5e380e3f52d8f5 (diff) | |
| download | guix-9b03299544e540ad5975abb306c19eb0168aa5e1.tar.gz | |
gnu: go-1.13: Target aarch64-linux for aarch64-linux.
Fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34872>. * gnu/packages/golang.scm (go-1.13)[arguments]: Set system to aarch64-linux when building for aarch64-linux. Adjust 'prebuild phase to skip tests which fail on aarch64-linux.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/golang.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c371bf4fc2..c5ca0d0352 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -233,6 +233,11 @@ in the style of communicating sequential processes (@dfn{CSP}).") "07gksk9194wa90xyd6yhagxfv7syvsx29bh8ypc4mg700vc1kfrl")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) + ((#:system system) + (if (string-prefix? "aarch64-linux" (or (%current-system) + (%current-target-system))) + "aarch64-linux" + system)) ((#:phases phases) `(modify-phases ,phases (replace 'prebuild @@ -329,6 +334,10 @@ in the style of communicating sequential processes (@dfn{CSP}).") ("syscall/exec_linux_test.go" "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) + ;; These tests fail on aarch64-linux + (substitute* "cmd/dist/test.go" + (("t.registerHostTest\\(\"testsanitizers/msan.*") "")) + ;; fix shebang for testar script ;; note the target script is generated at build time. (substitute* "../misc/cgo/testcarchive/carchive_test.go" |