From 91a56b4ab5e714e230c0088fb9f5ce0519efe1a0 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 7 May 2018 12:02:23 +0200
Subject: gnu: gcc > 5: Use 'CPATH' instead of 'C_INCLUDE_PATH' & co.

Partly addresses <https://bugs.gnu.org/30756>.
Reported by julien lepiller <julien@lepiller.eu>,
Marius Bakke <mbakke@fastmail.com>,
and Giel van Schijndel <giel@mortis.eu>

* gnu/packages/gcc.scm (gcc-6)[native-search-paths]: New field.
---
 gnu/packages/gcc.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 62b8968823..ba2fce6d37 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -476,7 +476,17 @@ (define-public gcc-6
                     "pa" "sh" "tilepro" "xtensa")))))
     (inputs
      `(("isl" ,isl)
-       ,@(package-inputs gcc-4.7)))))
+       ,@(package-inputs gcc-4.7)))
+
+    (native-search-paths
+     ;; We have to use 'CPATH' for GCC > 5, not 'C_INCLUDE_PATH' & co., due to
+     ;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129>.
+     (list (search-path-specification
+            (variable "CPATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "LIBRARY_PATH")
+            (files '("lib" "lib64")))))))
 
 (define-public gcc-7
   (package
-- 
cgit v1.2.3