From 356836ccbb6a187588ea6454bf1b7f7a679c5706 Mon Sep 17 00:00:00 2001
From: Tom Scogland <scogland1@llnl.gov>
Date: Fri, 1 Jan 2016 22:30:02 -0800
Subject: [PATCH 1/2] removed extraneous comment lines

---
 var/spack/packages/llvm/package.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/var/spack/packages/llvm/package.py b/var/spack/packages/llvm/package.py
index 19d82d81b71..61e9b68542d 100644
--- a/var/spack/packages/llvm/package.py
+++ b/var/spack/packages/llvm/package.py
@@ -206,8 +206,6 @@ 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()
             make("install")
             query_path = os.path.join('bin', 'clang-query')
             # Manually install clang-query, because llvm doesn't...

From 31803d10aac4dc163eb168de4028357aa23b68c3 Mon Sep 17 00:00:00 2001
From: Tom Scogland <scogland1@llnl.gov>
Date: Sat, 2 Jan 2016 11:59:33 -0800
Subject: [PATCH 2/2] bringing back configuration and build stages

---
 var/spack/packages/llvm/package.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/var/spack/packages/llvm/package.py b/var/spack/packages/llvm/package.py
index 61e9b68542d..419aef1ac99 100644
--- a/var/spack/packages/llvm/package.py
+++ b/var/spack/packages/llvm/package.py
@@ -206,6 +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()
             make("install")
             query_path = os.path.join('bin', 'clang-query')
             # Manually install clang-query, because llvm doesn't...