diff options
| author | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2015-04-07 10:41:57 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2015-04-08 09:29:38 +0200 |
| commit | de4b3828ca1d76254d5cd062f76be73e249561ca (patch) | |
| tree | 5b901cfac3a8ed6cecafa5d4ef9b617764ae24e7 | |
| parent | 9e54e957f99cfdf93c5414ee2f63ecf1faa0c804 (diff) | |
| download | patches-de4b3828ca1d76254d5cd062f76be73e249561ca.tar patches-de4b3828ca1d76254d5cd062f76be73e249561ca.tar.gz | |
gnu: julia: Pass MARCH make flag.
* gnu/packages/julia.scm (julia)[arguments]: Pass "MARCH" flag for supported
architectures.
| -rw-r--r-- | gnu/packages/julia.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index efc867d767..036e485be3 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -35,7 +35,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages textutils) - #:use-module (gnu packages version-control)) + #:use-module (gnu packages version-control) + #:use-module (ice-9 match)) (define-public julia (package @@ -51,7 +52,7 @@ "1hnbc2blzr9bc27m3vsr127fhg0h5imgqlrx00jakf0my0ccw8gr")))) (build-system gnu-build-system) (arguments - '(#:test-target "test" + `(#:test-target "test" #:modules ((ice-9 match) (guix build gnu-build-system) (guix build utils)) @@ -105,6 +106,14 @@ #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) + + ;; Passing the MARCH flag is necessary to build binary substitutes for + ;; the supported architectures. + ,(match (or (%current-target-system) + (%current-system)) + ("x86_64-linux" "MARCH=x86-64") + ("i686-linux" "MARCH=pentium4")) + "CONFIG_SHELL=bash" ;needed to build bundled libraries "USE_SYSTEM_LIBUV=0" ;Julia expects a modified libuv "USE_SYSTEM_DSFMT=0" ;not packaged for Guix and upstream has no |