diff options
| author | bors <bors@rust-lang.org> | 2013-12-07 10:51:12 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-07 10:51:12 -0800 |
| commit | 49b751dda19af57a2545a67879dd217e601b84c6 (patch) | |
| tree | 6c398004d15309527c551640bbc1abff438b4849 | |
| parent | 67aca9c9af9be7d04317d3ed452b7b253059818d (diff) | |
| parent | f04d6241cb2076ef5ee10896babd0f160e109346 (diff) | |
| download | rust-49b751dda19af57a2545a67879dd217e601b84c6.tar.gz rust-49b751dda19af57a2545a67879dd217e601b84c6.zip | |
auto merge of #10850 : alexcrichton/rust/fix-target, r=pcwalton
Right now multiple targets/hosts is broken because the libdir passed for all of the LLVM libraries is for the wrong architecture. By using the right arch (target, not host), everything is linked and assembled just fine.
| -rw-r--r-- | mk/target.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/target.mk b/mk/target.mk index 3bf0a2f7843..3c7ffd83d96 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -130,7 +130,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \ $$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@)) $$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_RGLOB_$(2)),$$(notdir $$@)) $$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \ - -L "$$(LLVM_LIBDIR_$(3))" \ + -L "$$(LLVM_LIBDIR_$(2))" \ --out-dir $$(@D) $$< && touch $$@ $$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@)) $$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_RGLOB_$(2)),$$(notdir $$@)) diff --git a/mk/tests.mk b/mk/tests.mk index 3f21b1b4819..6776345ec2b 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -377,7 +377,7 @@ $(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \ $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) @$$(call E, compile_and_link: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \ - -L "$$(LLVM_LIBDIR_$(3))" + -L "$$(LLVM_LIBDIR_$(2))" $(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)): \ $$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \ |