diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2016-03-16 11:29:49 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2016-03-16 18:32:25 -0500 |
| commit | dfdf5716887a98c08896ed66bcd48455c9912c60 (patch) | |
| tree | 32d31436b0a8bac14468e5aa72e83d8aec6c081f | |
| parent | d588422e139e7b45eec9ef291673de30b768e22b (diff) | |
| download | guix-dfdf5716887a98c08896ed66bcd48455c9912c60.tar.gz | |
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.
| -rw-r--r-- | 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 1352819f6a..6d3d134c20 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org> -;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> @@ -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))) |