me
/
guix
Archived
1
0
Fork 0
Code

gnu: QEMU: Remove obsolete workaround. 

* gnu/packages/virtualization.scm (qemu)[arguments]: Remove phase hide-glibc.
master
Marius Bakke 2021-06-17 15:59:26 +02:00
parent 879eb81906
commit 07d91d34d2
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/virtualization.scm
View File

@ -187,22 +187,6 @@
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'set-paths 'hide-glibc
(lambda* (#:key inputs #:allow-other-keys)
;; Work around https://issues.guix.info/issue/36882. We need to
;; remove glibc from C_INCLUDE_PATH so that the one hardcoded in GCC,
;; at the bottom of GCC include search-path is used.
(let* ((filters '("libc"))
(input-directories
(filter-map (lambda (input)
(match input
((name . dir)
(and (not (member name filters))
dir))))
inputs)))
(set-path-environment-variable "C_INCLUDE_PATH"
'("include")
input-directories))))
(add-after 'unpack 'extend-test-time-outs (add-after 'unpack 'extend-test-time-outs
(lambda _ (lambda _
;; These tests can time out on heavily-loaded and/or slow storage. ;; These tests can time out on heavily-loaded and/or slow storage.