Skip to content

Commit 8b964bf

Browse files
committed
Fix make install to install rlib files
It was only copying the host files, not the target rlib files.
1 parent 4252a24 commit 8b964bf

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

mk/install.mk

+6
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,11 @@ install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
8989
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
9090
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
9191
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
92+
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_RGLOB_$(1)))
9293
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
94+
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_RGLOB_$(1)))
9395
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_GLOB_$(1)))
96+
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_RGLOB_$(1)))
9497
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
9598

9699
endef
@@ -102,8 +105,11 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
102105
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
103106
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
104107
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
108+
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_RGLOB_$(1)))
105109
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
110+
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_RGLOB_$(1)))
106111
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_GLOB_$(1)))
112+
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_RGLOB_$(1)))
107113
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTC_GLOB_$(1)))
108114
$$(Q)$$(call INSTALL_LIB,$$(LIBSYNTAX_GLOB_$(1)))
109115
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTPKG_GLOB_$(1)))

0 commit comments

Comments
 (0)