Skip to content
Snippets Groups Projects
Commit 7082b0a5 authored by Todd Gamblin's avatar Todd Gamblin
Browse files

cc supports Python 2.6

parent 696e80c6
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
if not sys.version_info[:2] >= (2,7): if not sys.version_info[:2] >= (2,6):
sys.exit("Spack requires Python 2.7. Version was %s." % sys.version_info) sys.exit("Spack requires Python 2.6. Version was %s." % sys.version_info)
import os import os
import re import re
import subprocess import subprocess
import argparse
from contextlib import closing from contextlib import closing
# Import spack parameters through the build environment. # Import spack parameters through the build environment.
...@@ -18,6 +17,7 @@ if not spack_lib: ...@@ -18,6 +17,7 @@ if not spack_lib:
# Grab a minimal set of spack packages # Grab a minimal set of spack packages
sys.path.append(spack_lib) sys.path.append(spack_lib)
from spack.compilation import * from spack.compilation import *
from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty
spack_prefix = get_env_var("SPACK_PREFIX") spack_prefix = get_env_var("SPACK_PREFIX")
......
...@@ -45,6 +45,7 @@ class PythonVersionTest(unittest.TestCase): ...@@ -45,6 +45,7 @@ class PythonVersionTest(unittest.TestCase):
def spack_python_files(self): def spack_python_files(self):
# first file is the spack script. # first file is the spack script.
yield spack.spack_file yield spack.spack_file
yield os.path.join(spack.build_env_path, 'cc')
# Next files are all the source files and package files. # Next files are all the source files and package files.
search_paths = [spack.lib_path, spack.var_path] search_paths = [spack.lib_path, spack.var_path]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment