02/05: gnu: salmon: Fix build with GCC 7.

[guix-commits]

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

commit f8e0d93ca3424a3be238b211501cef84a151ec7b
Author: Marius Bakke <address@hidden>
Date:   Mon Jul 15 18:21:47 2019 +0200

    gnu: salmon: Fix build with GCC 7.
    
    * gnu/packages/bioinformatics.scm (salmon)[arguments]: Do not read from
    CPLUS_INCLUDE_PATH, and add headers to CPATH only.
---
 gnu/packages/bioinformatics.scm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 0dcbb94..1372bb4 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11874,14 +11874,11 @@ The following file formats are supported:
                (("lib/libdivsufsort.a") "/lib/libdivsufsort.so"))
 
              ;; Ensure that all headers can be found
-             (setenv "CPLUS_INCLUDE_PATH"
-                     (string-append (getenv "CPLUS_INCLUDE_PATH")
+             (setenv "CPATH"
+                     (string-append (getenv "CPATH")
                                     ":"
                                     (assoc-ref inputs "eigen")
                                     "/include/eigen3"))
-             (setenv "CPATH"
-                     (string-append (assoc-ref inputs "eigen")
-                                    "/include/eigen3"))
              #t))
          ;; CMAKE_INSTALL_PREFIX does not exist when the tests are
          ;; run.  It only exists after the install phase.