mk: Cross-compile fixes
This commit is contained in:
parent
5e6c04b9fa
commit
49c3f9f166
|
@ -45,23 +45,23 @@ PTL$(1)$(2) = $$(PTR$(1)$(2))/$(CFG_LIBDIR)
|
||||||
|
|
||||||
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
|
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
|
||||||
$$(Q)mkdir -p $$(PTL$(1)$(2))
|
$$(Q)mkdir -p $$(PTL$(1)$(2))
|
||||||
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME))
|
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTPKG_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTPKG_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL_LIB, \
|
$$(Q)$$(call INSTALL_LIB, \
|
||||||
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUST_GLOB))
|
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUST_GLOB_$(1)))
|
||||||
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
|
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
@ -93,19 +93,19 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
|
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
|
||||||
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
|
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
|
||||||
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X))
|
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X))
|
||||||
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC))
|
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG))
|
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
|
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI))
|
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUST))
|
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUST_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
|
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
|
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
|
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
|
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB))
|
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUST_GLOB))
|
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
|
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
|
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)))
|
||||||
$(Q)$(call INSTALL,$(S)/man, \
|
$(Q)$(call INSTALL,$(S)/man, \
|
||||||
$(PREFIX_ROOT)/share/man/man1,rustc.1)
|
$(PREFIX_ROOT)/share/man/man1,rustc.1)
|
||||||
|
|
||||||
|
@ -121,22 +121,22 @@ uninstall:
|
||||||
$(Q)rm -f $(PHB)/rusti$(X)
|
$(Q)rm -f $(PHB)/rusti$(X)
|
||||||
$(Q)rm -f $(PHB)/rust$(X)
|
$(Q)rm -f $(PHB)/rust$(X)
|
||||||
$(Q)rm -f $(PHB)/rustdoc$(X)
|
$(Q)rm -f $(PHB)/rustdoc$(X)
|
||||||
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
|
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG)
|
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC)
|
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC)
|
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI)
|
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)rm -f $(PHL)/$(CFG_LIBRUST)
|
$(Q)rm -f $(PHL)/$(CFG_LIBRUST_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)rm -f $(PHL)/$(CFG_RUNTIME)
|
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
|
||||||
$(Q)for i in \
|
$(Q)for i in \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB)) \
|
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE))) \
|
||||||
; \
|
; \
|
||||||
do rm -f $$i ; \
|
do rm -f $$i ; \
|
||||||
done
|
done
|
||||||
|
|
18
mk/tests.mk
18
mk/tests.mk
|
@ -220,50 +220,50 @@ define TEST_RUNNER
|
||||||
|
|
||||||
$(3)/test/coretest.stage$(1)-$(2)$$(X): \
|
$(3)/test/coretest.stage$(1)-$(2)$$(X): \
|
||||||
$$(CORELIB_CRATE) $$(CORELIB_INPUTS) \
|
$$(CORELIB_CRATE) $$(CORELIB_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
$(3)/test/stdtest.stage$(1)-$(2)$$(X): \
|
$(3)/test/stdtest.stage$(1)-$(2)$$(X): \
|
||||||
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
|
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
$(3)/test/syntaxtest.stage$(1)-$(2)$$(X): \
|
$(3)/test/syntaxtest.stage$(1)-$(2)$$(X): \
|
||||||
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
|
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
$(3)/test/rustctest.stage$(1)-$(2)$$(X): \
|
$(3)/test/rustctest.stage$(1)-$(2)$$(X): \
|
||||||
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
|
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM) \
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM_$(2)) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
$(3)/test/rustpkgtest.stage$(1)-$(2)$$(X): \
|
$(3)/test/rustpkgtest.stage$(1)-$(2)$$(X): \
|
||||||
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
|
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
$(3)/test/rustitest.stage$(1)-$(2)$$(X): \
|
$(3)/test/rustitest.stage$(1)-$(2)$$(X): \
|
||||||
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
|
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
$(3)/test/rusttest.stage$(1)-$(2)$$(X): \
|
$(3)/test/rusttest.stage$(1)-$(2)$$(X): \
|
||||||
$$(RUST_LIB) $$(RUST_INPUTS) \
|
$$(RUST_LIB) $$(RUST_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
$(3)/test/rustdoctest.stage$(1)-$(2)$$(X): \
|
$(3)/test/rustdoctest.stage$(1)-$(2)$$(X): \
|
||||||
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
|
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue