From 86660ab0b0073603ec535e55ad445dc491f8f078 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Thu, 10 Nov 2011 22:11:04 +0000
Subject: [PATCH] build/Make: Try to switch over to llvm-config-2 again, now
 that I've cleaned up some more of the explicit dependencies. I'm staging
 things more slowly this time in case there is more unanticipated fallout.

llvm-svn: 144323
---
 llvm/Makefile       | 2 +-
 llvm/Makefile.rules | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/Makefile b/llvm/Makefile
index dae41cf56aa1..016768e72e43 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -31,7 +31,7 @@ ifeq ($(BUILD_DIRS_ONLY),1)
   OPTIONAL_DIRS := tools/clang/utils/TableGen
 else
   DIRS := lib/Support lib/TableGen utils lib/VMCore lib tools/llvm-shlib \
-          tools/llvm-config tools runtime docs unittests
+          tools/llvm-config tools/llvm-config-2 tools runtime docs unittests
   OPTIONAL_DIRS := projects bindings
 endif
 
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index 6b68cf2c6b86..27043518f302 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -516,7 +516,7 @@ ifndef LLVM_TBLGEN
     LLVM_TBLGEN   := $(LLVMToolDir)/llvm-tblgen$(EXEEXT)
   endif
 endif
-LLVM_CONFIG := $(LLVMToolDir)/llvm-config
+LLVM_CONFIG := $(LLVMToolDir)/llvm-config-2
 ifndef LLVMLD
 LLVMLD    := $(LLVMToolDir)/llvm-ld$(EXEEXT)
 endif