diff options
| author | George Todd Gamblin <gamblin2@llnl.gov> | 2014-06-22 13:00:17 -0700 |
|---|---|---|
| committer | George Todd Gamblin <gamblin2@llnl.gov> | 2014-06-22 13:00:17 -0700 |
| commit | f7fe65102f082c743949708ed14767d22831b728 (patch) | |
| tree | 8f2d9d9a93f5f57fdd7fc121e9d320ab9b187158 /var | |
| parent | c66a6a16f9224ee340ba3f602115dc638f5807c4 (diff) | |
| parent | 33a11f32fdaea48192ecb13a85af11f85aa6b8bf (diff) | |
| download | spack-f7fe65102f082c743949708ed14767d22831b728.tar.gz spack-f7fe65102f082c743949708ed14767d22831b728.tar.bz2 spack-f7fe65102f082c743949708ed14767d22831b728.tar.xz spack-f7fe65102f082c743949708ed14767d22831b728.zip | |
Merge pull request #14 in SCALE/spack from features/compilers to develop
# By Todd Gamblin
# Via Todd Gamblin
* commit '33a11f32fdaea48192ecb13a85af11f85aa6b8bf': (21 commits)
Multi-compiler support feature-complete. Fix SPACK-3, SPACK-4, SPACK-12.
Executables can optionally ignore error output.
Enable allow_no_value for config parser.
Make tests use mock compiler configuration.
Set default editor to vi if EDITOR is not set.
Add working_dir, Version back into package build namespace.
Compiler support now uses configuration files.
Make debug and verbose output work properly.
Minor cleanup and bug fixes.
Add support for configuration files. Fix SPACK-24.
Proper exiting for forked process in do_install()
Move globals to spack's __init__.py
Move globals to spack's __init__.py
Adding per-compiler python files
Initial ability to swap compilers.
Better satisfies: e.g., v4.7.3 now satisfies v4.7
Add CompilerSpec class and loading capability.
Implemented compiler concretization policy.
Sorted out spack.compilers vs var/spack/compilers
Make Compiler constructor behave like Spec constructor.
...
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/mock_configs/site_spackconfig | 12 | ||||
| -rw-r--r-- | var/spack/mock_configs/user_spackconfig | 0 | ||||
| -rw-r--r-- | var/spack/packages/libdwarf/package.py | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/mock_configs/site_spackconfig b/var/spack/mock_configs/site_spackconfig new file mode 100644 index 0000000000..1358720362 --- /dev/null +++ b/var/spack/mock_configs/site_spackconfig @@ -0,0 +1,12 @@ +[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/user_spackconfig b/var/spack/mock_configs/user_spackconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/var/spack/mock_configs/user_spackconfig diff --git a/var/spack/packages/libdwarf/package.py b/var/spack/packages/libdwarf/package.py index 657e84705a..000187736c 100644 --- a/var/spack/packages/libdwarf/package.py +++ b/var/spack/packages/libdwarf/package.py @@ -39,6 +39,8 @@ class Libdwarf(Package): depends_on("libelf") + parallel = False + def clean(self): for dir in dwarf_dirs: |