llvm-config: Replace with C++ version (was llvm-config-2).

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 78d1f97e146bb91fdfa94e8f7bb567156fbb718c..b2132f11cb22f6a5b45ed458b3919a9140510186 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -79,7 +79,7 @@ LLVMBuildTool := $(PROJ_SRC_ROOT)/utils/llvm-build/llvm-build
 # The files we are going to generate using llvm-build.
 LLVMBuildMakeFrag := $(PROJ_OBJ_ROOT)/Makefile.llvmbuild
 LLVMConfigLibraryDependenciesInc := \
-       $(PROJ_OBJ_ROOT)/tools/llvm-config-2/LibraryDependencies.inc
+       $(PROJ_OBJ_ROOT)/tools/llvm-config/LibraryDependencies.inc
 
 # The rule to create the LLVMBuild Makefile fragment as well as the llvm-config
 # library table.
@@ -1006,11 +1006,16 @@ ifdef LINK_COMPONENTS
 
 # If LLVM_CONFIG doesn't exist, build it.  This can happen if you do a make
 # clean in tools, then do a make in tools (instead of at the top level).
+#
+# We don't want these targets when actually building the LLVM_CONFIG tool
+# itself, of course.
+ifneq ($(TOOLNAME),llvm-config)
 $(LLVM_CONFIG):
        @echo "*** llvm-config doesn't exist - rebuilding it."
        @$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
 
 $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
+endif
 
 ifeq ($(ENABLE_SHARED), 1)
 # We can take the "auto-import" feature to get rid of using dllimport.