summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-03-19 23:21:26 +0100
committerLudovic Courtès <ludo@gnu.org>2014-03-19 23:21:34 +0100
commitf6d47eb6d5e046abc8a7a7dc0863c5661197ef0d (patch)
tree588c979318286c78b1540901d582c509166db4a3
parentafd1cff14831ce85fde4418cc0b98287b0367a9a (diff)
downloadguix-f6d47eb6d5e046abc8a7a7dc0863c5661197ef0d.tar.gz
gnu: readline: Fix cross-compilation.
* gnu/packages/readline.scm (readline)[arguments]: Add
  "bash_cv_wcwidth_broken=no" to #:configure-flags
  when (%current-target-system) is true.
-rw-r--r--gnu/packages/readline.scm10
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index cf1bd67ce2..f35a52f614 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -53,7 +53,13 @@
       (arguments `(#:configure-flags
                    (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
                                         (assoc-ref %build-inputs "ncurses")
-                                        "/lib"))
+                                        "/lib")
+
+                         ;; This test does an 'AC_TRY_RUN', which aborts when
+                         ;; cross-compiling, so provide the correct answer.
+                         ,@(if (%current-target-system)
+                               '("bash_cv_wcwidth_broken=no")
+                               '()))
 
                    #:phases (alist-cons-after
                              'install 'post-install