From 13c01dd48a06fdec167955a2b39d830d3bbdff16 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 7 Nov 2012 14:05:37 -0800 Subject: [PATCH] Fix make install rules for new libraries --- Makefile.in | 7 ++++++- mk/install.mk | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 65a136bceb4..90ae9937c36 100644 --- a/Makefile.in +++ b/Makefile.in @@ -355,7 +355,12 @@ SREQ$(1)_T_$(2)_H_$(3) = \ $$(TSREQ$(1)_T_$(2)_H_$(3)) \ $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \ $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \ - $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) + $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \ + $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \ + $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \ + $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBCARGO) \ + $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \ + $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI) \ ifeq ($(1),0) # Don't run the the stage0 compiler under valgrind - that ship has sailed diff --git a/mk/install.mk b/mk/install.mk index 2efcf8df7cd..059a889beb9 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -44,6 +44,12 @@ 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)),$$(LIBFUZZER_GLOB)) + $$(Q)$$(call INSTALL_LIB, \ + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBCARGO_GLOB)) + $$(Q)$$(call INSTALL_LIB, \ + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB)) $$(Q)$$(call INSTALL_LIB, \ $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB)) $$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a) @@ -103,9 +109,11 @@ uninstall: $(Q)rm -f $(PHB)/cargo$(X) $(Q)rm -f $(PHB)/rusti$(X) $(Q)rm -f $(PHB)/rustdoc$(X) + $(Q)rm -f $(PHB)/fuzzer$(X) $(Q)rm -f $(PHL)/$(CFG_RUSTLLVM) $(Q)rm -f $(PHL)/$(CFG_LIBFUZZER) $(Q)rm -f $(PHL)/$(CFG_LIBCARGO) + $(Q)rm -f $(PHL)/$(CFG_LIBRUSTC) $(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC) $(Q)rm -f $(PHL)/$(CFG_LIBRUSTI) $(Q)rm -f $(PHL)/$(CFG_RUNTIME)