mbakke pushed a commit to branch core-updates
in repository guix.
commit 4a894c2f096d39ef3a412576c120f0e6d09806d5
Author: Marius Bakke <[email protected]>
AuthorDate: Fri Feb 7 17:06:07 2020 +0100
gnu: linux-libre: Remove obsolete workaround.
* gnu/packages/linux.scm (make-linux-libre*)[arguments]: Do not change CPATH
or CROSS_CPATH.
---
gnu/packages/linux.scm | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 06ef1fa..7793bf4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -684,27 +684,6 @@ 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)
- ;; 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"))
