fix catalyst so that it doesn't depend on a particular spelling of python (#16667)
This commit is contained in:
parent
32a9adcf60
commit
97d7ef678d
1 changed files with 7 additions and 1 deletions
|
@ -6,6 +6,7 @@
|
||||||
from spack import *
|
from spack import *
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import sys
|
||||||
import llnl.util.tty as tty
|
import llnl.util.tty as tty
|
||||||
|
|
||||||
|
|
||||||
|
@ -133,7 +134,12 @@ def do_stage(self, mirror_only=False):
|
||||||
'Editions')
|
'Editions')
|
||||||
catalyst_source_dir = os.path.abspath(self.root_cmakelists_dir)
|
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,
|
'-r', self.stage.source_path,
|
||||||
'-o', catalyst_source_dir]
|
'-o', catalyst_source_dir]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue