diff options
| author | Duncan Sands <baldrick@free.fr> | 2011-12-01 10:50:19 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2011-12-01 10:50:19 +0000 |
| commit | f6ace1924344b6bbeafe82494138f9673c22bddc (patch) | |
| tree | 556db7585a5afe5e322abde5514af86b7ea95a76 /Makefile.rules | |
| parent | 7d5a61e975260d01bb2079b5dcb9c93b76a4734d (diff) | |
| download | llvm-f6ace1924344b6bbeafe82494138f9673c22bddc.tar.gz llvm-f6ace1924344b6bbeafe82494138f9673c22bddc.tar.bz2 llvm-f6ace1924344b6bbeafe82494138f9673c22bddc.tar.xz | |
Revert commit 145449 (ddunbar) since it is breaking the dragonegg buildbots.
Original commit message:
llvm-config: Replace with C++ version (was llvm-config-2).
- Reapply of r144300, with lots of fixes/migration easement in between.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145582 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules index 670a8bb370..1c5effe65b 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 # This is for temporary backwards compatibility. ifndef TARGET_NATIVE_ARCH @@ -528,9 +528,9 @@ ifndef LLVM_TBLGEN endif endif ifeq ($(LLVM_CROSS_COMPILING),1) - LLVM_CONFIG := $(BuildLLVMToolDir)/llvm-config$(BUILD_EXEEXT) + LLVM_CONFIG := $(BuildLLVMToolDir)/llvm-config-2$(BUILD_EXEEXT) else - LLVM_CONFIG := $(LLVMToolDir)/llvm-config$(EXEEXT) + LLVM_CONFIG := $(LLVMToolDir)/llvm-config-2$(EXEEXT) endif ifndef LLVMLD LLVMLD := $(LLVMToolDir)/llvm-ld$(EXEEXT) |