zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure that clang-query gets installed

Browse Source
This commit is contained in:
Tom Scogland
2015-12-30 16:56:00 -08:00
parent 4ae98f8b21
commit 5d89fb8dfa
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/packages/llvm/package.py
View File

@@ -23,6 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import os, shutil
class Llvm(Package): class Llvm(Package):
@@ -182,7 +183,7 @@ def install(self, spec, prefix):
if '+lto' in spec: if '+lto' in spec:
cmake_args.append('-DLLVM_BINUTILS_INCDIR=' + os.path.join( spec['binutils'].prefix, 'include')) cmake_args.append('-DLLVM_BINUTILS_INCDIR=' + os.path.join( spec['binutils'].prefix, 'include'))
if '+polly' in spec: if '+polly' in spec:
cmake_args.append('-DPOLLY_LINK_INTO_TOOLS:Bool=ON') cmake_args.append('-DLINK_POLLY_INTO_TOOLS:Bool=ON')
else: else:
cmake_args.append('-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF') cmake_args.append('-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF')
@@ -205,6 +206,10 @@ def install(self, spec, prefix):
raise SpackException('The lldb variant requires the clang variant to be selected') raise SpackException('The lldb variant requires the clang variant to be selected')
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):
cmake(*cmake_args) # cmake(*cmake_args)
make() # make()
make("install") 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'))