Skip to content

Commit 13c01dd

Browse files
committed
Fix make install rules for new libraries
1 parent c2ffa3e commit 13c01dd

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

Makefile.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,12 @@ SREQ$(1)_T_$(2)_H_$(3) = \
355355
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
356356
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
357357
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
358-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
358+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \
359+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \
360+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \
361+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBCARGO) \
362+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \
363+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI) \
359364

360365
ifeq ($(1),0)
361366
# Don't run the the stage0 compiler under valgrind - that ship has sailed

mk/install.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
4444
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
4545
$$(Q)$$(call INSTALL_LIB, \
4646
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
47+
$$(Q)$$(call INSTALL_LIB, \
48+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBFUZZER_GLOB))
49+
$$(Q)$$(call INSTALL_LIB, \
50+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBCARGO_GLOB))
51+
$$(Q)$$(call INSTALL_LIB, \
52+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB))
4753
$$(Q)$$(call INSTALL_LIB, \
4854
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB))
4955
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
@@ -103,9 +109,11 @@ uninstall:
103109
$(Q)rm -f $(PHB)/cargo$(X)
104110
$(Q)rm -f $(PHB)/rusti$(X)
105111
$(Q)rm -f $(PHB)/rustdoc$(X)
112+
$(Q)rm -f $(PHB)/fuzzer$(X)
106113
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
107114
$(Q)rm -f $(PHL)/$(CFG_LIBFUZZER)
108115
$(Q)rm -f $(PHL)/$(CFG_LIBCARGO)
116+
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC)
109117
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC)
110118
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI)
111119
$(Q)rm -f $(PHL)/$(CFG_RUNTIME)

0 commit comments

Comments
 (0)