gnu: gcc-mesboot: Improve kernel headers fetch.

This is a follow-up to 1a15e067283e69bffe58cf68804e344a32ad1ef6 and
can be merged with it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 1e9d7b94fd1..dcac85536c5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1855,20 +1855,23 @@ exec " gcc-bin "/" program
                         (gcc      (dirname (dirname bin-gcc)))
                         (libc.a   (search-input-file inputs "/lib/libc.a"))
                         (glibc    (dirname (dirname libc.a)))
-                        (ioctl.h (search-input-file %build-inputs
-                                                    "/include/asm/ioctl.h"))
-                        (kernel-headers (dirname (dirname (dirname ioctl.h)))))
+                        (kernel-headers
+                         (search-input-directory inputs
+                                                 #$(if (system-hurd?)
+                                                       "include/mach"
+                                                       "include/linux")))
+                        (kernel-headers-include (dirname kernel-headers)))
                    (setenv "CONFIG_SHELL" (search-input-file inputs "bin/sh"))
                    (setenv "C_INCLUDE_PATH"
                            (string-append
                             gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.6.4/include"
-                            ":" kernel-headers "/include"
+                            ":" kernel-headers-include
                             ":" glibc "/include"
                             ":" (getcwd) "/mpfr/src"))
                    (setenv "CPLUS_INCLUDE_PATH"
                            (string-append
                             gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.6.4/include"
-                            ":" kernel-headers "/include"
+                            ":" kernel-headers-include
                             ":" glibc "/include"
                             ":" (getcwd) "/mpfr/src"))
                    (setenv "LIBRARY_PATH"