diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-04-30 00:00:24 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-05-07 07:11:33 +0200 |
| commit | 1339a03b6d28c0b1726b501bde27a807f960edff (patch) | |
| tree | d0f9d13046a2c97b7a1f7d075465cbe86930e4f0 /gnu | |
| parent | 598be42dfa3aa1f6a92b5562397742b3fa96a3e0 (diff) | |
| download | guix-1339a03b6d28c0b1726b501bde27a807f960edff.tar.gz guix-1339a03b6d28c0b1726b501bde27a807f960edff.zip | |
gnu: glibc/hurd-headers: Cross-build fix for the Hurd.
* gnu/packages/base.scm (glibc/hurd-headers)[native-inputs]: Add mig; when
cross-building use 32-bit mig.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a49ea25196..38e8d363eb 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> @@ -1173,6 +1173,15 @@ command.") (outputs '("out")) (propagated-inputs `(("gnumach-headers" ,gnumach-headers) ("hurd-headers" ,hurd-headers))) + (native-inputs + `(("mig" ,(if (%current-target-system) + ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, + ;; hence this hack. + (package + (inherit mig) + (arguments `(#:system "i686-linux"))) + mig)) + ,@(package-native-inputs glibc))) (arguments (substitute-keyword-arguments (package-arguments glibc) ;; We just pass the flags really needed to build the headers. |