diff options
| author | bors <bors@rust-lang.org> | 2015-12-18 03:05:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-18 03:05:02 +0000 |
| commit | 27d551142f9e3cd2fc402555a8f6287dd0fc01ac (patch) | |
| tree | 4bad6b8bd8d8240a177d9f40d0a1b7d9b233d2ea | |
| parent | 4eadabd9f8818c562446751a0ef03ea2165e7056 (diff) | |
| parent | 04f9a3f8fe7bb3bf51157105ab5027ad8f759fce (diff) | |
| download | rust-27d551142f9e3cd2fc402555a8f6287dd0fc01ac.tar.gz rust-27d551142f9e3cd2fc402555a8f6287dd0fc01ac.zip | |
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
| -rw-r--r-- | mk/llvm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/llvm.mk b/mk/llvm.mk index 6d5e9169367..a4174efa5ef 100644 --- a/mk/llvm.mk +++ b/mk/llvm.mk @@ -100,8 +100,8 @@ $(foreach host,$(CFG_HOST), \ # This can't be done in target.mk because it's included before this file. define LLVM_LINKAGE_DEPS -$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustc_llvm: $$(LLVM_LINKAGE_PATH_$(3)) -RUSTFLAGS$(1)_rustc_llvm_T_$(3) += $$(shell echo $$(LLVM_ALL_COMPONENTS_$(3)) | tr '-' '_' |\ +$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustc_llvm: $$(LLVM_LINKAGE_PATH_$(2)) +RUSTFLAGS$(1)_rustc_llvm_T_$(2) += $$(shell echo $$(LLVM_ALL_COMPONENTS_$(2)) | tr '-' '_' |\ sed -e 's/^ //;s/\([^ ]*\)/\-\-cfg have_component_\1/g') endef |