mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-30 22:36:50 +01:00
gnu: julia: Avoid old-style input and output alists.
* gnu/packages/julia.scm (julia)[arguments]: Remove references to ‘%outputs’ and ‘%build-inputs’ in #:make-flags. Change-Id: I400c038437a1f9f8bc010d22aa874c892958cfe2
This commit is contained in:
parent
1c9984fc2a
commit
c5fd5e7dfe
1 changed files with 5 additions and 6 deletions
|
@ -549,8 +549,7 @@ (define file
|
|||
("" "$JULIA_DEPOT_PATH"))))))))
|
||||
|
||||
#:make-flags
|
||||
#~(list (string-append "prefix="
|
||||
(assoc-ref %outputs "out"))
|
||||
#~(list (string-append "prefix=" #$output)
|
||||
|
||||
;; Passing the MARCH or JULIA_CPU_TARGET flag is necessary to build
|
||||
;; binary substitutes for the supported architectures. See also
|
||||
|
@ -571,8 +570,7 @@ (define file
|
|||
(_ "JULIA_CPU_TARGET=generic"))
|
||||
|
||||
"CONFIG_SHELL=bash -x" ;needed to build bundled libraries
|
||||
(string-append "CC="
|
||||
#$(cc-for-target))
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
|
||||
#$@(if (target-x86-64?)
|
||||
`("USE_BLAS64=1"
|
||||
|
@ -582,8 +580,9 @@ (define file
|
|||
"LIBBLASNAME=libopenblas"))
|
||||
|
||||
(string-append "UTF8PROC_INC="
|
||||
(assoc-ref %build-inputs "utf8proc")
|
||||
"/include")
|
||||
(dirname
|
||||
(search-input-file %build-inputs
|
||||
"/include/utf8proc.h")))
|
||||
;; Make.inc expects a static library for libuv.
|
||||
(string-append "LIBUV="
|
||||
(search-input-file %build-inputs
|
||||
|
|
Loading…
Reference in a new issue