diff options
| author | Omar Padron <omar.padron@kitware.com> | 2020-05-15 15:11:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 15:11:32 -0400 |
| commit | 97d7ef678d8e9647958ba89d446037b1c21edc2c (patch) | |
| tree | 86472c28d6464a1f00a0a13d0ac4e6e5692c50b0 /var | |
| parent | 32a9adcf606b1e6ab08da0eadad6bfa6d9d63db7 (diff) | |
| download | spack-97d7ef678d8e9647958ba89d446037b1c21edc2c.tar.gz spack-97d7ef678d8e9647958ba89d446037b1c21edc2c.tar.bz2 spack-97d7ef678d8e9647958ba89d446037b1c21edc2c.tar.xz spack-97d7ef678d8e9647958ba89d446037b1c21edc2c.zip | |
fix catalyst so that it doesn't depend on a particular spelling of python (#16667)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/catalyst/package.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index c00aca23e9..1a2967926d 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -6,6 +6,7 @@ from spack import * import os import subprocess +import sys import llnl.util.tty as tty @@ -133,7 +134,12 @@ class Catalyst(CMakePackage): 'Editions') catalyst_source_dir = os.path.abspath(self.root_cmakelists_dir) - command = ['python', catalyst_script, + python_path = (os.path.realpath( + spec['python3'].command.path if '+python3' in self.spec else + spec['python'].command.path if '+python' in self.spec else + sys.executable)) + + command = [python_path, catalyst_script, '-r', self.stage.source_path, '-o', catalyst_source_dir] |