diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 16:05:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 19:50:01 +0200 |
| commit | 0e47fcced442d8e7c1b05184fdc1c14f10ed04ec (patch) | |
| tree | 4ae844bc0ec3c670f8697bdc24362c122fa718ad /gnu/packages/julia.scm | |
| parent | e4b70bc55a538569465bcedee19d1f2607308e65 (diff) | |
| parent | 8b1bde7bb3936a64244824500ffe60f123704437 (diff) | |
| download | guix-patches-0e47fcced442d8e7c1b05184fdc1c14f10ed04ec.tar guix-patches-0e47fcced442d8e7c1b05184fdc1c14f10ed04ec.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/julia.scm')
| -rw-r--r-- | gnu/packages/julia.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 13c9f7baf1..abefc388bc 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> @@ -377,10 +377,12 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (%current-system)) ("x86_64-linux" "MARCH=x86-64") ("i686-linux" "MARCH=pentium4") - ("aarch64-linux" "MARCH=armv8-a") + ("armhf-linux" "JULIA_CPU_TARGET=armv7-a,neon") + ("powerpc64le-linux" "JULIA_CPU_TARGET=pwr8") ;; Prevent errors when querying this package on unsupported ;; platforms, e.g. when running "guix package --search=" - (_ "MARCH=UNSUPPORTED")) + ;; and also of targeting the builder's architecture. + (_ "JULIA_CPU_TARGET=generic")) "CONFIG_SHELL=bash" ;needed to build bundled libraries ;; list of "USE_SYSTEM_*" is here: |