diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-11-13 14:43:12 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-11-13 15:02:32 +0100 |
| commit | 12424b3ecfdf401c72804ddfa4b2fa2d8b1b68e5 (patch) | |
| tree | 4e47b2822008c5e538f394791cd4b81bd691f022 | |
| parent | c3232fcc7785abc1057a0d4b5b1832f1e39c9c1b (diff) | |
| download | guix-12424b3ecfdf401c72804ddfa4b2fa2d8b1b68e5.tar.gz guix-12424b3ecfdf401c72804ddfa4b2fa2d8b1b68e5.zip | |
gnu: libwhich: Cross-compile.
* gnu/packages/julia.scm (libwhich)[arguments]: Use CC-FOR-TARGET.
Look for zlib in NATIVE-INPUTS.
| -rw-r--r-- | gnu/packages/julia.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 65fa726d92..5cb4e53140 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2020 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> ;;; ;;; This file is part of GNU Guix. ;;; @@ -195,14 +196,14 @@ "1bpa0fcqpa3ai3hm8mz0p13bf76fsq53wsfcx5qw302zh22108xr")))) (arguments `(#:make-flags - (list "CC=gcc") + (list (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'check 'set-ld-library-path - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs #:allow-other-keys) (setenv "LD_LIBRARY_PATH" - (string-append (assoc-ref inputs "zlib") "/lib")))) + (string-append (assoc-ref native-inputs "zlib") "/lib")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) |