summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-09-03 23:49:06 +0200
committerLudovic Courtès <ludo@gnu.org>2018-09-03 23:49:12 +0200
commitfd95f37f361ad9444fb13faebda29662d3bf7be6 (patch)
treefd9e2aaf97246adf17d6555bc32397713bbb5965
parent5108c18e7e163c3b45568f1f4c3416581a2cea19 (diff)
downloadguix-fd95f37f361ad9444fb13faebda29662d3bf7be6.tar.gz
Revert "gnu: perl: Add support for cross-compilation"
This reverts commit 5108c18e7e163c3b45568f1f4c3416581a2cea19, which was
accidentally committed.
-rw-r--r--gnu/packages/perl.scm8
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index b10be9567d..4d70e019b9 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")