mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 14fbb1ac0a5fc117204ad53d6dd39d910fa43fec
Author: Mathieu Othacehe <[email protected]>
Date: Wed Jun 26 10:16:32 2019 +0200
gnu: perl: Fix cross-compilation.
* gnu/packages/perl.scm (perl)[arguments]: Use cross-libc instead of libc
when
cross-compiling.
---
gnu/packages/perl.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 63b8e38..b348a3e 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -22,6 +22,7 @@
;;; Copyright © 2018, 2019 Pierre Neidhardt <[email protected]>
;;; Copyright © 2018 Kei Kebreau <[email protected]>
;;; Copyright © 2019 Alex Griffin <[email protected]>
+;;; Copyright © 2019 Mathieu Othacehe <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -81,7 +82,7 @@
"perl-reproducible-build-date.patch"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f
+ `(#:tests? #f
#:configure-flags
(let ((out (assoc-ref %outputs "out"))
(libc (assoc-ref %build-inputs "libc")))
@@ -130,7 +131,9 @@
(add-after 'install 'remove-extra-references
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (libc (assoc-ref inputs "libc"))
+ (libc (assoc-ref inputs
+ ,(if (%current-target-system)
+ "cross-libc" "libc")))
(config1 (car (find-files (string-append out "/lib/perl5")
"^Config_heavy\\.pl$")))
(config2 (find-files (string-append out "/lib/perl5")
