diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-11-12 10:47:25 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-11-12 10:47:25 +0100 |
commit | 07914def98ca0d148e3522466227304e45286786 (patch) | |
tree | 71f265728ced786cb70de2a5654c9beb45eb77c5 /gnu/packages/cross-base.scm | |
parent | a13063d6ac7434beed1c608ce3eb6fb39c740b33 (diff) | |
parent | ef1107e2cca9a5b6f7129d019aabac2f0e89a238 (diff) |
Merge branch 'version-1.2.0'
Diffstat (limited to 'gnu/packages/cross-base.scm')
-rw-r--r-- | gnu/packages/cross-base.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index b35a3cb40b..c1e5f2eb79 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -539,19 +539,20 @@ and the cross tool chain." ;; FIXME: 'static-bash' should really be an input, not a native input, but ;; to do that will require building an intermediate cross libc. - (inputs '()) + (inputs (if (hurd-triplet? target) + `(;; TODO: move to glibc in the next rebuild cycle + ("hurd-mach-print.patch" + ,(search-patch "glibc-hurd-mach-print.patch")) + ("hurd-gettyent.patch" + ,(search-patch "glibc-hurd-gettyent.patch"))) + '())) (native-inputs `(("cross-gcc" ,xgcc) ("cross-binutils" ,xbinutils) ,@(if (hurd-triplet? target) `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) - "cross-mig")) - ;; TODO: move to glibc in the next rebuild cycle - ("hurd-mach-print.patch" - ,@(search-patches "glibc-hurd-mach-print.patch")) - ("hurd-gettyent.patch" - ,@(search-patches "glibc-hurd-gettyent.patch"))) + "cross-mig"))) '()) ,@(package-inputs libc) ;FIXME: static-bash ,@(package-native-inputs libc)))))) |