aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/mpi.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-14 18:13:34 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-14 18:13:34 +0200
commit97149c576762de7fd8e1a6ac8f46c97d3490b360 (patch)
tree971fee6c4be8c3d7a43dbc46bb4509f2b6081213 /gnu/packages/mpi.scm
parentad60a3484c6d3221b78dbc6f173ce27bc3b1f96a (diff)
downloadguix-97149c576762de7fd8e1a6ac8f46c97d3490b360.tar
guix-97149c576762de7fd8e1a6ac8f46c97d3490b360.tar.gz
gnu: Adjust uses of C{,PLUS}_INCLUDE_PATH for GCC 7.
These variables are no longer set in the build environment by default. GCC still respects these search paths and treats them as "system headers" so we can continue to use them, just not expect them to be available. * gnu/packages/mpi.scm (openmpi)[arguments]: Do not attempt to read from C_INCLUDE_PATH, nor CPLUS_INCLUDE_PATH. * gnu/packages/games.scm (kiki)[arguments]: Likewise. * gnu/packages/networking.scm (hcxtools)[arguments]: Likewise. * gnu/packages/synergy.scm (synergy)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (gemma, sailfish)[arguments]: Likewise. * gnu/packages/maths.scm (dune-alugrid)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/mpi.scm')
-rw-r--r--gnu/packages/mpi.scm6
1 files changed, 2 insertions, 4 deletions
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index c9cd7b1382..c02e1d2e2b 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -217,12 +217,10 @@ bind processes, and much more.")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "C_INCLUDE_PATH"
(string-append (assoc-ref inputs "opensm")
- "/include/infiniband/:"
- (getenv "C_INCLUDE_PATH")))
+ "/include/infiniband"))
(setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "opensm")
- "/include/infiniband/:"
- (getenv "CPLUS_INCLUDE_PATH")))
+ "/include/infiniband"))
#t))
(add-before 'build 'remove-absolute
(lambda _