From b3a334af6a897475860c3b60ab2045b7a7abe0f0 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 3 Jan 2014 14:16:43 -0800 Subject: [PATCH] mk: Fix llvmdeps.rs dependencies In a multi-host build the mklldeps.py tool is getting called before all the llvm-configs are built. I am not actually sure the cause. I had convinced myself that DEF_LLVM_RULES needed to be called before the llvmdeps.rs rule, but now looking at it again I can't see why. --- mk/llvm.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/llvm.mk b/mk/llvm.mk index c85a4687613..f8d0c624de5 100644 --- a/mk/llvm.mk +++ b/mk/llvm.mk @@ -47,11 +47,11 @@ endef $(foreach host,$(CFG_HOST), \ $(eval LLVM_CONFIGS := $(LLVM_CONFIGS) $(LLVM_CONFIG_$(host)))) +$(foreach host,$(CFG_HOST), \ + $(eval $(call DEF_LLVM_RULES,$(host)))) + $(S)src/librustc/lib/llvmdeps.rs: \ $(LLVM_CONFIGS) \ $(S)src/etc/mklldeps.py $(Q)$(CFG_PYTHON) $(S)src/etc/mklldeps.py \ "$@" "$(LLVM_COMPONENTS)" $(LLVM_CONFIGS) - -$(foreach host,$(CFG_HOST), \ - $(eval $(call DEF_LLVM_RULES,$(host))))