02/03: gnu: petsc: Fix compiler configuration references.

[Eric Bavier]

bavier pushed a commit to branch master
in repository guix.

commit dfdf5716887a98c08896ed66bcd48455c9912c60
Author: Eric Bavier <address@hidden>
Date:   Wed Mar 16 11:29:49 2016 -0500

    gnu: petsc: Fix compiler configuration references.
    
    * gnu/packages/maths.scm (petsc)[arguments]: When patching compiler
      driver paths, do not assume they come from fortran input.
---
 gnu/packages/maths.scm |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 1352819..6d3d134 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <address@hidden>
 ;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2014 John Darrington <address@hidden>
-;;; Copyright © 2014, 2015 Eric Bavier <address@hidden>
+;;; Copyright © 2014, 2015, 2016 Eric Bavier <address@hidden>
 ;;; Copyright © 2014 Federico Beffa <address@hidden>
 ;;; Copyright © 2014 Mathieu Lirzin <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
@@ -565,16 +565,15 @@ ASCII text files using Gmsh's own scripting language.")
           'install 'clean-install
           ;; Try to keep installed files from leaking build directory names.
           (lambda* (#:key inputs outputs #:allow-other-keys)
-            (let ((out     (assoc-ref outputs "out"))
-                  (fortran (assoc-ref inputs  "gfortran")))
+            (let ((out     (assoc-ref outputs "out")))
               (substitute* (map (lambda (file)
                                   (string-append out "/lib/petsc/conf/" file))
                                 '("petscvariables" "PETScConfig.cmake"))
                 (((getcwd)) out))
               ;; Make compiler references point to the store
               (substitute* (string-append out "/lib/petsc/conf/petscvariables")
-                (("= g(cc|\\+\\+|fortran)" _ suffix)
-                 (string-append "= " fortran "/bin/g" suffix)))
+                (("= (gcc|g\\+\\+|gfortran)" _ compiler)
+                 (string-append "= " (which compiler))))
               ;; PETSc installs some build logs, which aren't necessary.
               (for-each (lambda (file)
                           (let ((f (string-append out "/lib/petsc/conf/" 
file)))