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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144323 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile b/Makefile
index dae41cf56aa1d4cbe959a38f5509277e3bf6fa88..016768e72e4391053090810a2945649af18cc70e 100644 (file)
--- a/Makefile
+++ b/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/Makefile.rules b/Makefile.rules
index 6b68cf2c6b862641a10bd417244cf0912742a90e..27043518f3028d2ae83e4e5cba7c69414288146e 100644 (file)
--- a/Makefile.rules
+++ b/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