[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#32953] [PATCH core-updates-next 7/8] gnu: cmake: Try CPATH and C_IN
From: |
Marius Bakke |
Subject: |
[bug#32953] [PATCH core-updates-next 7/8] gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries. |
Date: |
Sat, 6 Oct 2018 15:16:38 +0200 |
* 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
- [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 1/8] gnu: Remove gcc-for-libstdc++., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 4/8] gnu: Remove duplicate linux-libre-headers package from bootstrap inputs., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 3/8] gnu: gcc-boot0: Improve gcc-wrapper workarounds., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 6/8] gnu: python: Fix FTBFS with GCC >= 6., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 7/8] gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries.,
Marius Bakke <=
- [bug#32953] [PATCH core-updates-next 2/8] gnu: libstdc++-boot0: Improve gcc-wrapper workaround., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 5/8] gnu: Use GCC 7 as the default compiler., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 8/8] gnu: cppunit: Update to 1.14.0., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler., Marius Bakke, 2018/10/06