From a5772b9278e91cc088ff232b3123f0e682c4bc92 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Mon, 14 Nov 2011 17:17:45 +0000 Subject: [PATCH] build/Make: Switch over to using llvm-config-2 for dependencies one more (hopefully last) time, now that it also builds as a build tool. llvm-svn: 144535 --- llvm/Makefile.rules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index e5719b329ab1..3816bbb1a1cb 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -527,7 +527,11 @@ ifndef LLVM_TBLGEN LLVM_TBLGEN := $(LLVMToolDir)/llvm-tblgen$(EXEEXT) endif endif -LLVM_CONFIG := $(LLVMToolDir)/llvm-config +ifeq ($(LLVM_CROSS_COMPILING),1) + LLVM_CONFIG := $(BuildLLVMToolDir)/llvm-config-2$(BUILD_EXEEXT) +else + LLVM_CONFIG := $(LLVMToolDir)/llvm-config-2$(EXEEXT) +endif ifndef LLVMLD LLVMLD := $(LLVMToolDir)/llvm-ld$(EXEEXT) endif