From 12b0dbd472d1020565b2d1e3f4c72fca635db0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 25 Mar 2015 21:26:31 +0100 Subject: [PATCH] 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'. --- gnu/packages/cross-base.scm | 5 +++++ 1 file changed, 5 insertions(+) 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)))))