01/04: gnu: perf: Treat kernel headers as system headers.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 5157edd8854c895dfb78f6cf49e906e49745ca8a
Author: Marius Bakke <address@hidden>
Date:   Mon Sep 23 16:13:43 2019 +0200

    gnu: perf: Treat kernel headers as system headers.
    
    * gnu/packages/linux.scm (perf)[arguments]: Instead of disabling -Werror,
    set C_INCLUDE_PATH.
---
 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6664620..d7e3d7e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3091,15 +3091,16 @@ in a digital read-out.")
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key inputs #:allow-other-keys)
-             ;; Don't build with '-Werror', really.
-             (substitute* "tools/lib/bpf/Makefile"
-               (("-Werror") ""))
-
              (setenv "SHELL_PATH" (which "bash"))
              (chdir "tools/perf")
              #t)))
        #:make-flags (list (string-append "prefix="
                                          (assoc-ref %outputs "out"))
+                          ;; Make sure the kernel headers are treated as system
+                          ;; headers to suppress warnings from those.
+                          (string-append "C_INCLUDE_PATH="
+                                         (assoc-ref %build-inputs 
"kernel-headers")
+                                         "/include")
                           "WERROR=0"
 
                           ;; By default, 'config/Makefile' uses lib64 on