guix-commits
[Top][All Lists]
Advanced

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

01/01: Revert "gnu: perl: Add support for cross-compilation"


From: Ludovic Courtès
Subject: 01/01: Revert "gnu: perl: Add support for cross-compilation"
Date: Mon, 3 Sep 2018 17:49:48 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit fd95f37f361ad9444fb13faebda29662d3bf7be6
Author: Ludovic Courtès <address@hidden>
Date:   Mon Sep 3 23:49:06 2018 +0200

    Revert "gnu: perl: Add support for cross-compilation"
    
    This reverts commit 5108c18e7e163c3b45568f1f4c3416581a2cea19, which was
    accidentally committed.
---
 gnu/packages/perl.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index b10be95..4d70e01 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -48,7 +48,6 @@
   #:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages cross-base)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages perl-web)
@@ -80,7 +79,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")))
@@ -129,10 +128,7 @@
          (add-after 'install 'remove-extra-references
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out     (assoc-ref outputs "out"))
-                    (libc (assoc-ref inputs
-                             (if ,(%current-target-system)
-                                  "cross-libc"
-                                  "libc")))
+                    (libc    (assoc-ref inputs "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]