Skip to content

Commit 27d5511

Browse files
committed
Auto merge of #30414 - alexcrichton:fix-cross-builds, r=brson
It looks like #27937 accidentally switched the llvmdeps file from the target to the host by accident, so be sure to use the right llvmdeps file which is built for the target when building rustc_llvm
2 parents 4eadabd + 04f9a3f commit 27d5511

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mk/llvm.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ $(foreach host,$(CFG_HOST), \
100100

101101
# This can't be done in target.mk because it's included before this file.
102102
define LLVM_LINKAGE_DEPS
103-
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustc_llvm: $$(LLVM_LINKAGE_PATH_$(3))
104-
RUSTFLAGS$(1)_rustc_llvm_T_$(3) += $$(shell echo $$(LLVM_ALL_COMPONENTS_$(3)) | tr '-' '_' |\
103+
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustc_llvm: $$(LLVM_LINKAGE_PATH_$(2))
104+
RUSTFLAGS$(1)_rustc_llvm_T_$(2) += $$(shell echo $$(LLVM_ALL_COMPONENTS_$(2)) | tr '-' '_' |\
105105
sed -e 's/^ //;s/\([^ ]*\)/\-\-cfg have_component_\1/g')
106106
endef
107107

0 commit comments

Comments
 (0)