diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 18:49:59 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 18:49:59 +0000 |
| commit | a6f5a81285bab84212209d47b1238505512c7c87 (patch) | |
| tree | 91c13e119cf881c3a6527e1a9e7f0b149128c699 /Makefile.rules | |
| parent | f084e1dc42c5c0a69c29de68bf129c39ca5d3641 (diff) | |
| download | llvm-a6f5a81285bab84212209d47b1238505512c7c87.tar.gz llvm-a6f5a81285bab84212209d47b1238505512c7c87.tar.bz2 llvm-a6f5a81285bab84212209d47b1238505512c7c87.tar.xz | |
llvm-config: Replace with C++ version (was llvm-config-2).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144300 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules index 78d1f97e14..b2132f11cb 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-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. |