diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-18 16:06:03 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-18 16:06:03 -0700 |
| commit | f68e64d738054a01b38fd6840fc7932c0912a85c (patch) | |
| tree | d43ff92ee1c4d6c2ecfe4079e2a86764d22da981 /var | |
| parent | cd1ca36488fb9c9c5e195a830ea9a3a4c7bde760 (diff) | |
| parent | 46b91ddf57beb54f05fc6a3cc70283d4b17d1bd3 (diff) | |
| download | spack-f68e64d738054a01b38fd6840fc7932c0912a85c.tar.gz spack-f68e64d738054a01b38fd6840fc7932c0912a85c.tar.bz2 spack-f68e64d738054a01b38fd6840fc7932c0912a85c.tar.xz spack-f68e64d738054a01b38fd6840fc7932c0912a85c.zip | |
Merge branch 'mplegendre-features/yaml-config' into features/optional-deps
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/mock_configs/site_spackconfig | 12 | ||||
| -rw-r--r-- | var/spack/mock_configs/site_spackconfig/compilers.yaml | 12 | ||||
| -rw-r--r-- | var/spack/mock_configs/user_spackconfig | 0 |
3 files changed, 12 insertions, 12 deletions
diff --git a/var/spack/mock_configs/site_spackconfig b/var/spack/mock_configs/site_spackconfig deleted file mode 100644 index 1358720362..0000000000 --- a/var/spack/mock_configs/site_spackconfig +++ /dev/null @@ -1,12 +0,0 @@ -[compiler "gcc@4.5.0"] - cc = /path/to/gcc - cxx = /path/to/g++ - f77 = /path/to/gfortran - fc = /path/to/gfortran - -[compiler "clang@3.3"] - cc = /path/to/clang - cxx = /path/to/clang++ - f77 = None - fc = None - diff --git a/var/spack/mock_configs/site_spackconfig/compilers.yaml b/var/spack/mock_configs/site_spackconfig/compilers.yaml new file mode 100644 index 0000000000..0a2dc893e2 --- /dev/null +++ b/var/spack/mock_configs/site_spackconfig/compilers.yaml @@ -0,0 +1,12 @@ +compilers: + all: + clang@3.3: + cc: /path/to/clang + cxx: /path/to/clang++ + f77: None + fc: None + gcc@4.5.0: + cc: /path/to/gcc + cxx: /path/to/g++ + f77: /path/to/gfortran + fc: /path/to/gfortran diff --git a/var/spack/mock_configs/user_spackconfig b/var/spack/mock_configs/user_spackconfig deleted file mode 100644 index e69de29bb2..0000000000 --- a/var/spack/mock_configs/user_spackconfig +++ /dev/null |