gnu: linux-libre: Remove obsolete workaround.

* gnu/packages/linux.scm (make-linux-libre*)[arguments]: Do not change CPATH
or CROSS_CPATH.
This commit is contained in:
Marius Bakke 2020-02-07 17:06:07 +01:00
parent bbd1e4e7ed
commit 4a894c2f09
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -684,27 +684,6 @@ (define* (make-linux-libre* version source supported-systems
#t))
(replace 'configure
(lambda* (#:key inputs native-inputs target #:allow-other-keys)
;; On AArch64 (at least), we need to remove glibc headers from
;; CPATH (they are still available as "system headers"), so that
;; the kernel can override uint64_t. See
;; <https://bugs.gnu.org/37593>. This is also true when
;; cross-compiling, except in that case, cross-libc must be
;; removed from CROSS_CPATH.
(let ((var ,(if (%current-target-system)
"CROSS_CPATH"
"CPATH"))
(libc ,(if (%current-target-system)
"cross-libc"
"libc")))
(setenv var
(string-join
(remove
(cut string-prefix? (assoc-ref inputs libc) <>)
(string-split (getenv var) #\:))
":"))
(format #t "environment variable `~a' changed to `~a'~%"
var (getenv var)))
;; Avoid introducing timestamps
(setenv "KCONFIG_NOTIMESTAMP" "1")
(setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))