diff options
| -rw-r--r-- | mk/install.mk | 14 | ||||
| -rw-r--r-- | mk/tools.mk | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/mk/install.mk b/mk/install.mk index abd80dad8b6..2efcf8df7cd 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -44,6 +44,8 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB)) $$(Q)$$(call INSTALL_LIB, \ $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB)) + $$(Q)$$(call INSTALL_LIB, \ + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB)) $$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a) endef @@ -72,19 +74,20 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE)) $(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1 $(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X)) $(Q)$(call INSTALL,$(HB2),$(PHB),fuzzer$(X)) - $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBFUZZER)) $(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X)) - $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBCARGO)) - $(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X)) $(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X)) + $(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X)) + $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC)) + $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBFUZZER)) + $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBCARGO)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI)) - $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB)) + $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM)) $(Q)$(call INSTALL,$(S)/man, \ $(PREFIX_ROOT)/share/man/man1,rustc.1) @@ -111,6 +114,9 @@ uninstall: $(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \ $(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \ $(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \ + $(call HOST_LIB_FROM_HL_GLOB,$(LIBCARGO_GLOB)) \ + $(call HOST_LIB_FROM_HL_GLOB,$(LIBFUZZER_GLOB)) \ + $(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB)) \ $(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB)) \ ; \ do rm -f $$i ; \ diff --git a/mk/tools.mk b/mk/tools.mk index 93f794be29d..292fe62eafc 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -48,6 +48,9 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBFUZZER): \ $$(HSREQ$(2)_H_$(4)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ + $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_GLOB) \ + $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_DSYM_GLOB)) \ + $$(HLIB$(2)_H_$(4)) $$(HBIN$(2)_H_$(4))/fuzzer$$(X): \ $$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X) \ @@ -91,6 +94,9 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBCARGO): \ $$(HSREQ$(2)_H_$(4)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ + $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBCARGO_GLOB) \ + $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBCARGO_DSYM_GLOB)) \ + $$(HLIB$(2)_H_$(4)) $$(HBIN$(2)_H_$(4))/cargo$$(X): \ $$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X) \ @@ -120,6 +126,9 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTDOC): \ $$(HSREQ$(2)_H_$(4)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ + $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOC_GLOB) \ + $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOC_DSYM_GLOB)) \ + $$(HLIB$(2)_H_$(4)) $$(HBIN$(2)_H_$(4))/rustdoc$$(X): \ $$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X) \ @@ -149,6 +158,9 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTI): \ $$(HSREQ$(2)_H_$(4)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ + $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTI_GLOB) \ + $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTI_DSYM_GLOB)) \ + $$(HLIB$(2)_H_$(4)) $$(HBIN$(2)_H_$(4))/rusti$$(X): \ $$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X) \ |