summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-03-25 21:26:31 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-25 21:26:31 +0100
commit12b0dbd472d1020565b2d1e3f4c72fca635db0a8 (patch)
treed03f3d781e50b7d91f6b23a2ec05b17f1b9955bc
parent25d5b708a636ecf779035f75ad110574fc0262b9 (diff)
downloadguix-12b0dbd472d1020565b2d1e3f4c72fca635db0a8.tar.gz
gnu: cross-base: Make the libc static-bash bug more apparent.
The 'static-bash' input of cross libcs has always been compiled
natively.  This patch makes the issue more visible.

* gnu/packages/cross-base.scm (cross-libc): Add 'inputs' field, and
  add (package-inputs glibc) to 'native-inputs'.
-rw-r--r--gnu/packages/cross-base.scm5
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 5a67d4b6ac..dbcc5bc268 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -298,8 +298,13 @@ XBINUTILS and the cross tool chain."
     ;; "linux-headers" input to point to the right thing.
     (propagated-inputs `(("linux-headers" ,xlinux-headers)))
 
+    ;; FIXME: 'static-bash' should really be an input, not a native input, but
+    ;; to do that will require building an intermediate cross libc.
+    (inputs '())
+
     (native-inputs `(("cross-gcc" ,xgcc)
                      ("cross-binutils" ,xbinutils)
+                     ,@(package-inputs glibc)     ;FIXME: static-bash
                      ,@(package-native-inputs glibc)))))