diff options
| author | bors <bors@rust-lang.org> | 2014-12-01 07:11:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-01 07:11:53 +0000 |
| commit | 09f04bf2c919725d5ee69b8cbb34cdcbb3433e25 (patch) | |
| tree | d2183070d2092e9708317b0b5c51aa81a59c0351 | |
| parent | bda97e8557820cc4ec13645dbdf976e5ccaa0ce1 (diff) | |
| parent | 1d4ce379465927778e57a1782de809f8502635f9 (diff) | |
| download | rust-09f04bf2c919725d5ee69b8cbb34cdcbb3433e25.tar.gz rust-09f04bf2c919725d5ee69b8cbb34cdcbb3433e25.zip | |
auto merge of #19417 : alexcrichton/rust/issue-19383, r=huonw
We only build LLVM for the host architecture, not the target architecture, so this was just a minor typo in the parameters uses. Closes #19383
| -rw-r--r-- | mk/target.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mk/target.mk b/mk/target.mk index 5b0de64574c..1f67d9ed8da 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -79,7 +79,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ $$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4))) $$(call REMOVE_ALL_OLD_GLOB_MATCHES, \ $$(dir $$@)$$(call CFG_RLIB_GLOB,$(4))) - $(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(2)) \ + $(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(3)) \ $$(subst @,,$$(STAGE$(1)_T_$(2)_H_$(3))) \ $$(RUST_LIB_FLAGS_ST$(1)) \ -L "$$(RT_OUTPUT_DIR_$(2))" \ diff --git a/mk/tests.mk b/mk/tests.mk index 88a5fb81cb3..e5cde66293c 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -412,7 +412,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \ $$(CRATEFILE_$(4)) \ $$(TESTDEP_$(1)_$(2)_$(3)_$(4)) @$$(call E, rustc: $$@) - $(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(2)) \ + $(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(3)) \ $$(subst @,,$$(STAGE$(1)_T_$(2)_H_$(3))) -o $$@ $$< --test \ -L "$$(RT_OUTPUT_DIR_$(2))" \ -L "$$(LLVM_LIBDIR_$(2))" \ @@ -891,7 +891,7 @@ endif ifeq ($(2),$$(CFG_BUILD)) $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4)) @$$(call E, run doc-crate-$(4) [$(2)]) - $$(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(2)) \ + $$(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(3)) \ $$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test --cfg dox \ $$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@ else |