summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMario Melara <maamelara@gmail.com>2016-03-02 14:18:19 -0800
committerMario Melara <maamelara@gmail.com>2016-03-02 14:18:19 -0800
commitb4298979fee43c36c4af040d7e529c342b7db0e8 (patch)
tree18bbf9167dc483c09bce7955dc3f869cb366a105 /var
parent975cba295bc3141a9888292623702f1ee45f3d3a (diff)
parent676591ffc0d62a4d3b20653a2faa788c06d96d77 (diff)
downloadspack-b4298979fee43c36c4af040d7e529c342b7db0e8.tar.gz
spack-b4298979fee43c36c4af040d7e529c342b7db0e8.tar.bz2
spack-b4298979fee43c36c4af040d7e529c342b7db0e8.tar.xz
spack-b4298979fee43c36c4af040d7e529c342b7db0e8.zip
Merge branch 'features/newarch' of https://github.com/NERSC/spack into features/newarch
Diffstat (limited to 'var')
-rw-r--r--var/spack/mock_configs/site_spackconfig/compilers.yaml23
1 files changed, 18 insertions, 5 deletions
diff --git a/var/spack/mock_configs/site_spackconfig/compilers.yaml b/var/spack/mock_configs/site_spackconfig/compilers.yaml
index fcbf7a53f1..72fa252881 100644
--- a/var/spack/mock_configs/site_spackconfig/compilers.yaml
+++ b/var/spack/mock_configs/site_spackconfig/compilers.yaml
@@ -13,10 +13,23 @@ compilers:
fc: /path/to/gfortran
modules: None
gcc@5.2.0:
- cc: cc
- cxx: CC
- f77: ftn
- fc: ftn
- modules:
+ cc: cc
+ cxx: CC
+ f77: ftn
+ fc: ftn
+ modules:
- PrgEnv-gnu
- gcc/5.2.0
+ intel@15.0.1:
+ cc: cc
+ ccx: CC
+ f77: ftn
+ fc: ftn
+ modules:
+ - PrgEnv-intel
+ - intel/15.0.1
+ intel@15.1.2:
+ cc: /path/to/icc
+ cxx: /path/to/ic++
+ f77: /path/to/ifort
+ fc: /path/to/ifort