diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 19:59:35 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 19:59:35 +0000 |
| commit | 1ad92131abbed3d2992d5996969274a8e1ae9a6b (patch) | |
| tree | 773ce7f5c949f85879d65bb5f26620ba6e9ed587 /Makefile.rules | |
| parent | 0ad62be9aa54c4e4670af758c37c2d0673bc67e4 (diff) | |
| download | llvm-1ad92131abbed3d2992d5996969274a8e1ae9a6b.tar.gz llvm-1ad92131abbed3d2992d5996969274a8e1ae9a6b.tar.bz2 llvm-1ad92131abbed3d2992d5996969274a8e1ae9a6b.tar.xz | |
Revert r144300 "llvm-config: Replace with C++ version (was llvm-config-2).",
which didn't appear ready for prime time.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144309 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.rules b/Makefile.rules index b2132f11cb..78d1f97e14 100644 --- 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/LibraryDependencies.inc + $(PROJ_OBJ_ROOT)/tools/llvm-config-2/LibraryDependencies.inc # The rule to create the LLVMBuild Makefile fragment as well as the llvm-config # library table. @@ -1006,16 +1006,11 @@ 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. |