From a0195371e886e93110816209b118e994a497805c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 7 Jan 2017 19:38:53 -0600 Subject: Unset PETSC_DIR during installation (#2768) * Set PETSC_DIR during installation * Move env var unsets to setup_environment * Fix unset var name and number of args --- var/spack/repos/builtin/packages/petsc/package.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 578349cbc4..7d51bbad48 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -218,6 +218,16 @@ class Petsc(Package): '-pc_type', 'hypre', '-pc_hypre_type', 'boomeramg') + def setup_environment(self, spack_env, run_env): + # configure fails if these env vars are set outside of Spack + spack_env.unset('PETSC_DIR') + spack_env.unset('PETSC_ARCH') + + # Set PETSC_DIR in the module file + run_env.set('PETSC_DIR', self.prefix) + run_env.unset('PETSC_ARCH') + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - # set up PETSC_DIR for everyone using PETSc package + # Set up PETSC_DIR for everyone using PETSc package spack_env.set('PETSC_DIR', self.prefix) + spack_env.unset('PETSC_ARCH') -- cgit v1.2.3-70-g09d2