diff options
| author | Tom Scogland <scogland1@llnl.gov> | 2015-12-30 16:56:00 -0800 |
|---|---|---|
| committer | Tom Scogland <scogland1@llnl.gov> | 2015-12-30 16:59:39 -0800 |
| commit | 5d89fb8dfa200072fbbd2d2945c0a38917477ae1 (patch) | |
| tree | 936035c2328def9f7a6ba72dfda90f3c30f2a349 | |
| parent | 4ae98f8b214ea491a50aa2ddf3d995625d1b35f7 (diff) | |
| download | spack-5d89fb8dfa200072fbbd2d2945c0a38917477ae1.tar.gz spack-5d89fb8dfa200072fbbd2d2945c0a38917477ae1.tar.bz2 spack-5d89fb8dfa200072fbbd2d2945c0a38917477ae1.tar.xz spack-5d89fb8dfa200072fbbd2d2945c0a38917477ae1.zip | |
ensure that clang-query gets installed
| -rw-r--r-- | var/spack/packages/llvm/package.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/var/spack/packages/llvm/package.py b/var/spack/packages/llvm/package.py index eeb2c11fe2..19d82d81b7 100644 --- a/var/spack/packages/llvm/package.py +++ b/var/spack/packages/llvm/package.py @@ -23,6 +23,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import os, shutil class Llvm(Package): @@ -182,7 +183,7 @@ class Llvm(Package): if '+lto' in spec: cmake_args.append('-DLLVM_BINUTILS_INCDIR=' + os.path.join( spec['binutils'].prefix, 'include')) if '+polly' in spec: - cmake_args.append('-DPOLLY_LINK_INTO_TOOLS:Bool=ON') + cmake_args.append('-DLINK_POLLY_INTO_TOOLS:Bool=ON') else: cmake_args.append('-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF') @@ -205,6 +206,10 @@ class Llvm(Package): raise SpackException('The lldb variant requires the clang variant to be selected') with working_dir('spack-build', create=True): - cmake(*cmake_args) - make() + # cmake(*cmake_args) + # make() make("install") + query_path = os.path.join('bin', 'clang-query') + # Manually install clang-query, because llvm doesn't... + if os.path.exists(query_path): + shutil.copy(query_path, os.path.join(prefix, 'bin')) |