summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-06-17 15:59:26 +0200
committerMarius Bakke <marius@gnu.org>2021-06-19 17:09:51 +0200
commit07d91d34d2d7a9b8f1d4ab5b3a0a1191b054d379 (patch)
treec95184f35f8051c854fddb9de982ceee45f602b4 /gnu
parent879eb81906dbc6161d8ef7be91026257c0a84946 (diff)
downloadguix-07d91d34d2d7a9b8f1d4ab5b3a0a1191b054d379.tar.gz
gnu: QEMU: Remove obsolete workaround.
* gnu/packages/virtualization.scm (qemu)[arguments]: Remove phase hide-glibc.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/virtualization.scm16
1 files changed, 0 insertions, 16 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index a38d1c5aa1..e34fb2d738 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.