summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-11-14 17:17:45 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-11-14 17:17:45 +0000
commit7c67d32a321898fe08c015300b9540f8ecaa3358 (patch)
treecd454fc2b383482fa3914b5451e197430a4e5615 /Makefile.rules
parentf5e47ac596c698f1659c86bdad3a60056e68439c (diff)
downloadllvm-7c67d32a321898fe08c015300b9540f8ecaa3358.tar.gz
llvm-7c67d32a321898fe08c015300b9540f8ecaa3358.tar.bz2
llvm-7c67d32a321898fe08c015300b9540f8ecaa3358.tar.xz
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144535 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules
index e5719b329a..3816bbb1a1 100644
--- a/Makefile.rules
+++ b/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