From 97d7ef678d8e9647958ba89d446037b1c21edc2c Mon Sep 17 00:00:00 2001 From: Omar Padron Date: Fri, 15 May 2020 15:11:32 -0400 Subject: fix catalyst so that it doesn't depend on a particular spelling of python (#16667) --- var/spack/repos/builtin/packages/catalyst/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') 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] -- cgit v1.2.3-70-g09d2