[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: julia: Pass MARCH make flag.
From: |
Ricardo Wurmus |
Subject: |
02/02: gnu: julia: Pass MARCH make flag. |
Date: |
Wed, 08 Apr 2015 07:29:54 +0000 |
rekado pushed a commit to branch master
in repository guix.
commit de4b3828ca1d76254d5cd062f76be73e249561ca
Author: Ricardo Wurmus <address@hidden>
Date: Tue Apr 7 10:41:57 2015 +0200
gnu: julia: Pass MARCH make flag.
* gnu/packages/julia.scm (julia)[arguments]: Pass "MARCH" flag for supported
architectures.
---
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 efc867d..036e485 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