Merge remote branch 'origin/llvm-rework' into llvm-rework

var/spack/packages/llvm/package.py

@@ -206,8 +206,8 @@ def install(self, spec, prefix):
                 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...