From 12424b3ecfdf401c72804ddfa4b2fa2d8b1b68e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 14:43:12 +0100 Subject: gnu: libwhich: Cross-compile. * gnu/packages/julia.scm (libwhich)[arguments]: Use CC-FOR-TARGET. Look for zlib in NATIVE-INPUTS. --- gnu/packages/julia.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/julia.scm') 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 ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Tim Howes +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; 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"))) -- cgit v1.2.3