summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-04-05 16:33:19 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-04-05 16:33:19 +0200
commit41cb710f4a400e67914a2b51bd204184f2889308 (patch)
tree252ea6fc0a10aff70db8b8ee85f3a21833eca80a
parentf12f7a046461e9b3e228e1db6f568b7d5ceebceb (diff)
downloadguix-41cb710f4a400e67914a2b51bd204184f2889308.tar.gz
gnu: criu: Remove obsolete workaround.
* gnu/packages/virtualization.scm (criu)[arguments]: In the configure phase,
do not add kernel headers on C_INLUDE_PATH.
-rw-r--r--gnu/packages/virtualization.scm8
1 files changed, 1 insertions, 7 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9f80e333be..4368949743 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -730,13 +730,7 @@ domains, their live performance and resource utilization statistics.")
              (setenv "C_INCLUDE_PATH"
                      (string-append (assoc-ref inputs "libnl")
                                     "/include/libnl3:"
-                                    ;; Also add the kernel headers here so that GCC
-                                    ;; treats them as "system headers".  Otherwise
-                                    ;; the build fails with -Werror because parasite.c
-                                    ;; includes both <linux/fs.h> and <sys/mount.h>,
-                                    ;; which define some of the same constants.
-                                    (assoc-ref inputs "kernel-headers")
-                                    "/include"))
+                                    (or (getenv "C_INCLUDE_PATH") "")))
              #t))
          (add-after 'configure 'fix-documentation
            (lambda* (#:key inputs outputs #:allow-other-keys)