diff options
| author | Matthew LeGendre <legendre1@llnl.gov> | 2016-03-09 16:18:37 -0800 |
|---|---|---|
| committer | Matthew LeGendre <legendre1@llnl.gov> | 2016-03-09 16:18:37 -0800 |
| commit | dd0ae255ad8669c57ca2f560da6cd20bb4ee9179 (patch) | |
| tree | 6bfd08501f471e44ad04860f5669f86ff933bbd7 /lib | |
| parent | 1f06dd40f7e65252568da23e9758bf5af02833eb (diff) | |
| parent | d4a771a6235da662bd9b38f7b9272c38ae93ecd1 (diff) | |
| download | spack-dd0ae255ad8669c57ca2f560da6cd20bb4ee9179.tar.gz spack-dd0ae255ad8669c57ca2f560da6cd20bb4ee9179.tar.bz2 spack-dd0ae255ad8669c57ca2f560da6cd20bb4ee9179.tar.xz spack-dd0ae255ad8669c57ca2f560da6cd20bb4ee9179.zip | |
Merge branch 'features/external-packages' of github.com:mplegendre/spack into features/external-packages
Conflicts:
lib/spack/docs/site_configuration.rst
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/docs/site_configuration.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/docs/site_configuration.rst b/lib/spack/docs/site_configuration.rst index ebf0437106..76fe8fdd7d 100644 --- a/lib/spack/docs/site_configuration.rst +++ b/lib/spack/docs/site_configuration.rst @@ -75,7 +75,7 @@ directory. Here's an example of an external configuration: openmpi@1.6.5%intel@10.1=chaos_5_x86_64_ib: /opt/openmpi-1.6.5-intel This example lists three installations of OpenMPI, one built with gcc, -one built with gcc and debug information, and another built with OpenMPI. +one built with gcc and debug information, and another built with Intel. If Spack is asked to build a package that uses one of these MPIs as a dependency, it will use the the pre-installed OpenMPI in the given directory. This example also specifies that Spack should never @@ -116,7 +116,7 @@ be: The addition of the ``nobuild`` flag tells Spack that it should never build its own version of OpenMPI, and it will instead always rely on a pre-built -OpenMPI. Similar to ``path``, ``nobuild`` is specified as a property under +OpenMPI. Similar to ``paths``, ``nobuild`` is specified as a property under a package name. The ``nobuild`` does not need to be paired with external packages. |