From dfdf5716887a98c08896ed66bcd48455c9912c60 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 16 Mar 2016 11:29:49 -0500 Subject: 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 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/maths.scm') 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 ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014 John Darrington -;;; Copyright © 2014, 2015 Eric Bavier +;;; Copyright © 2014, 2015, 2016 Eric Bavier ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2014 Mathieu Lirzin ;;; Copyright © 2015 Ricardo Wurmus @@ -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))) -- cgit v1.2.3