[llvm-commits] [llvm] r144323 - in /llvm/trunk: Makefile Makefile.rules

[Daniel Dunbar]

Author: ddunbar
Date: Thu Nov 10 16:11:04 2011
New Revision: 144323

URL: http://llvm.org/viewvc/llvm-project?rev=144323&view=rev
Log:
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.

Modified:
    llvm/trunk/Makefile
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=144323&r1=144322&r2=144323&view=diff
==============================================================================
--- llvm/trunk/Makefile (original)
+++ llvm/trunk/Makefile Thu Nov 10 16:11:04 2011
@@ -31,7 +31,7 @@
   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
 

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=144323&r1=144322&r2=144323&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Thu Nov 10 16:11:04 2011
@@ -516,7 +516,7 @@
     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