From a51c9c903f9db26a08672c7e19ddddeef1aee6b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 13:04:13 +0100 Subject: gnu: rhash: Fix cross-compilation. * gnu/packages/crypto.scm (rhash)[arguments]: In custom configure phase, set "--target" and "-cc" when cross-compiling. --- gnu/packages/crypto.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 4e761de2ce..79472847d6 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -728,9 +729,16 @@ (define-public rhash (replace 'configure ;; ./configure is not GNU autotools' and doesn't gracefully handle ;; unrecognized options, so we must call it manually. - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key native-inputs outputs #:allow-other-keys) (invoke "./configure" - (string-append "--prefix=" (assoc-ref outputs "out"))))) + (string-append "--prefix=" (assoc-ref outputs "out")) + ,@(let ((target (%current-target-system))) + (if target + `((string-append "--target=" ,target) + (string-append "--cc=" + (assoc-ref native-inputs "cross-gcc") + "/bin/" ,target "-gcc")) + '()))))) (add-before 'check 'patch-/bin/sh (lambda _ (substitute* "Makefile" -- cgit v1.2.3