From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8mSB-0006KA-Tp for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8mS9-0002AU-7o for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g8mS9-0002A0-1w for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g8mS8-0002s2-TD for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:04 -0400 Subject: [bug#32953] [PATCH core-updates-next 7/8] gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries. Resent-Message-ID: From: Marius Bakke Date: Sat, 6 Oct 2018 15:16:38 +0200 Message-Id: <20181006131639.8424-7-mbakke@fastmail.com> In-Reply-To: <20181006131639.8424-1-mbakke@fastmail.com> References: <20181006131639.8424-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32953@debbugs.gnu.org * gnu/packages/cmake.scm (cmake)[arguments]: Try both CPATH and C_INCLUDE_PATH instead of just the latter. --- gnu/packages/cmake.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 5abf08755..3f3f1c1f4 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -116,7 +116,8 @@ ;; Help cmake's bootstrap process to find system libraries (begin (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH") + (getenv "C_INCLUDE_PATH"))) #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) -- 2.19.0