From e47f410536899d2653f86ff374809f1c63ec8ae6 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 1 Nov 2011 16:12:19 -0700
Subject: [PATCH] Use LLVM directly from the build directory

This will cut out the few seconds it takes to run make install.
---
 configure  | 14 +++++---------
 mk/llvm.mk |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 5f84ecaff9d..00e7929d576 100755
--- a/configure
+++ b/configure
@@ -414,9 +414,6 @@ putvar CFG_LLVM_LDFLAGS
 putvar CFG_LLVM_LIBS
 putvar CFG_LLVM_TRIPLE
 
-LLVM_BUILD_DIR=llvm/build
-LLVM_INST_DIR=llvm/install
-
 step_msg "making directories"
 
 for i in \
@@ -425,7 +422,7 @@ for i in \
     dl \
     test/run-pass test/run-fail test/compile-fail \
     test/bench test/perf test/pretty \
-    $LLVM_BUILD_DIR $LLVM_INST_DIR
+    llvm
 do
     make_dir $i
 done
@@ -499,13 +496,12 @@ msg
 # Configure llvm. Here we go...
 step_msg "configuring LLVM"
 
-CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}/src/llvm
-CFG_LLVM_BUILD_DIR=${CFG_BUILD_DIR}/${LLVM_BUILD_DIR}
-CFG_LLVM_INST_DIR=${CFG_BUILD_DIR}/${LLVM_INST_DIR}
+CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm
+CFG_LLVM_BUILD_DIR=${CFG_BUILD_DIR}/llvm
+CFG_LLVM_INST_DIR=${CFG_LLVM_BUILD_DIR}/Release+Asserts
 
 LLVM_TARGETS="--enable-targets=x86,x86_64"
 LLVM_DISABLE="--disable-docs"
-LLVM_PREFIX="--prefix=${CFG_LLVM_INST_DIR}"
 LLVM_BUILD="--build=${CFG_HOST_TRIPLE}"
 LLVM_HOST="--host=${CFG_HOST_TRIPLE}"
 LLVM_TARGET="--target=${CFG_HOST_TRIPLE}"
@@ -529,7 +525,7 @@ CFLAGS=$LLVM_CFLAGS
 CXXFLAGS=$LLVM_CXXFLAGS
 LDFLAGS=$LLVM_LDFLAGS
 
-LLVM_FLAGS="$LLVM_TARGETS $LLVM_DISABLE $LLVM_PREFIX $LLVM_BUILD $LLVM_HOST $LLVM_TARGET"
+LLVM_FLAGS="$LLVM_TARGETS $LLVM_DISABLE $LLVM_BUILD $LLVM_HOST $LLVM_TARGET"
 
 export CXX
 export CC
diff --git a/mk/llvm.mk b/mk/llvm.mk
index 06ce64b8bc7..2743c289d48 100644
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -2,4 +2,4 @@
 
 $(CFG_LLVM_INST_DIR)/bin/llc:
 	@$(call E, make: llvm)
-	$(Q)make install -C $(CFG_LLVM_BUILD_DIR)
\ No newline at end of file
+	$(Q)make -C $(CFG_LLVM_BUILD_DIR)
\ No newline at end of file