Fix the linked targets for rustc

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.

diff --git a/mk/target.mk b/mk/target.mk
index 3bf0a2f7843d82ab01ebc228120564b37b82f711..3c7ffd83d968197f7c5ff6fff1852f326d5047a6 100644 (file)
--- 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 3f21b1b4819d5c27502d6ecea8fbe3b04714ae29..6776345ec2b385bbee1a90831fcf36a20420f0f6 100644 (file)
--- 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)              \