guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/17: gnu: perl: Fix cross-compilation.


From: guix-commits
Subject: 01/17: gnu: perl: Fix cross-compilation.
Date: Mon, 2 Sep 2019 11:21:50 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-next
in repository guix.

commit 659a2d0f4fff889dff902e32b569e4ca0ae5384a
Author: Mathieu Othacehe <address@hidden>
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 a3f6e5d..275cb20 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2018, 2019 Pierre Neidhardt <address@hidden>
 ;;; Copyright © 2018 Kei Kebreau <address@hidden>
 ;;; Copyright © 2019 Alex Griffin <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
 ;;;
 ;;; 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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]