From 07d91d34d2d7a9b8f1d4ab5b3a0a1191b054d379 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 17 Jun 2021 15:59:26 +0200 Subject: 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(-) (limited to 'gnu/packages/virtualization.scm') 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. -- cgit v1.2.3