guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/07: gnu: QEMU: Remove obsolete workaround.


From: guix-commits
Subject: 01/07: gnu: QEMU: Remove obsolete workaround.
Date: Sat, 19 Jun 2021 11:13:11 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 07d91d34d2d7a9b8f1d4ab5b3a0a1191b054d379
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jun 17 15:59:26 2021 +0200

    gnu: QEMU: Remove obsolete workaround.
    
    * gnu/packages/virtualization.scm (qemu)[arguments]: Remove phase 
hide-glibc.
---
 gnu/packages/virtualization.scm | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index a38d1c5..e34fb2d 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -187,22 +187,6 @@
                   ,@%gnu-build-system-modules)
        #: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
            (lambda _
              ;; These tests can time out on heavily-loaded and/or slow storage.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]