diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-07-20 09:45:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 09:45:36 -0700 |
| commit | 01a361d637ddc723051afd9e503dbadafd3e17e9 (patch) | |
| tree | 9891d004fafed07730a9f9f8eb7916705d5657a1 /lib | |
| parent | 7f2067896997d31fdc2285ddd0557b6493cb3647 (diff) | |
| parent | 218fc602fad2caf88b5e71c640b1569e5ab408da (diff) | |
| download | spack-01a361d637ddc723051afd9e503dbadafd3e17e9.tar.gz spack-01a361d637ddc723051afd9e503dbadafd3e17e9.tar.bz2 spack-01a361d637ddc723051afd9e503dbadafd3e17e9.tar.xz spack-01a361d637ddc723051afd9e503dbadafd3e17e9.zip | |
Merge pull request #1288 from LLNL/features/cray_compiler_names
Let packages call use_cray_compilers() in install to get , etc set to…
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/spack/env/cc | 4 | ||||
| l--------- | lib/spack/env/craype/CC | 1 | ||||
| l--------- | lib/spack/env/craype/cc | 1 | ||||
| l--------- | lib/spack/env/craype/ftn | 1 | ||||
| -rw-r--r-- | lib/spack/spack/package.py | 7 |
5 files changed, 12 insertions, 2 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc index bf98b4c354..c6bb50d261 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -110,13 +110,13 @@ case "$command" in comp="CXX" lang_flags=CXX ;; - f90|fc|f95|gfortran|ifort|pgfortran|xlf90|nagfor) + ftn|f90|fc|f95|gfortran|ifort|pgfortran|xlf90|nagfor) command="$SPACK_FC" language="Fortran 90" comp="FC" lang_flags=F ;; - f77|gfortran|ifort|pgfortran|xlf|nagfor) + f77|gfortran|ifort|pgfortran|xlf|nagfor|ftn) command="$SPACK_F77" language="Fortran 77" comp="F77" diff --git a/lib/spack/env/craype/CC b/lib/spack/env/craype/CC new file mode 120000 index 0000000000..82c2b8e90a --- /dev/null +++ b/lib/spack/env/craype/CC @@ -0,0 +1 @@ +../cc
\ No newline at end of file diff --git a/lib/spack/env/craype/cc b/lib/spack/env/craype/cc new file mode 120000 index 0000000000..82c2b8e90a --- /dev/null +++ b/lib/spack/env/craype/cc @@ -0,0 +1 @@ +../cc
\ No newline at end of file diff --git a/lib/spack/env/craype/ftn b/lib/spack/env/craype/ftn new file mode 120000 index 0000000000..82c2b8e90a --- /dev/null +++ b/lib/spack/env/craype/ftn @@ -0,0 +1 @@ +../cc
\ No newline at end of file diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 6a92c548fb..c916bfaaa2 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -1439,6 +1439,13 @@ def install_dependency_symlinks(pkg, spec, prefix): flatten_dependencies(spec, prefix) +def use_cray_compiler_names(): + """Compiler names for builds that rely on cray compiler names.""" + os.environ['CC'] = 'cc' + os.environ['CXX'] = 'CC' + os.environ['FC'] = 'ftn' + os.environ['F77'] = 'ftn' + def flatten_dependencies(spec, flat_dir): """Make each dependency of spec present in dir via symlink.""" for dep in spec.traverse(root=False): |