01/01: gnu: make-linux-libre: Fix cross-compilation.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit 6ef379f879a1d098ec55a9ca294e808e24291daf
Author: Mathieu Othacehe <address@hidden>
Date:   Wed Sep 4 18:21:19 2019 +0200

    gnu: make-linux-libre: Fix cross-compilation.
    
    * gnu/packages/linux.scm (make-linux-libre)[arguments]: Unset CROSS_CPATH to
    make sure that cross-libc is not found. Otherwise, some of its header would
    conflict with the one from linux (stdint.h and linux/types.h).
---
 gnu/packages/linux.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7794deb..890548e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -669,6 +669,12 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
              #t))
          (replace 'configure
            (lambda* (#:key inputs native-inputs target #:allow-other-keys)
+             ;; Unset CROSS_CPATH to make sure that cross-libc is not
+             ;; found. Otherwise, some of its header would conflict with the
+             ;; one from linux (stdint.h and linux/types.h)
+             ,@(if (%current-target-system)
+                   '((unsetenv "CROSS_CPATH"))
+                   '())
              ;; Avoid introducing timestamps
              (setenv "KCONFIG_NOTIMESTAMP" "1")
              (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))