Skip to content

Commit 61443dc

Browse files
committed
auto merge of #10753 : alexcrichton/rust/fix-make-install, r=huonw
Turns out that we only want to install the target rlibs, not the host rlibs. I had it backwards the first time, then mixed up the second time, but this time should get it right. There's no need for host rlib files because none of them are needed at runtime.
2 parents 0455e4c + c6e934f commit 61443dc

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

mk/install.mk

-3
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,8 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
148148
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD)))
149149
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD)))
150150
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD)))
151-
$(Q)$(call INSTALL_LIB,$(STDLIB_RGLOB_$(CFG_BUILD)))
152151
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD)))
153-
$(Q)$(call INSTALL_LIB,$(EXTRALIB_RGLOB_$(CFG_BUILD)))
154152
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_GLOB_$(CFG_BUILD)))
155-
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_RGLOB_$(CFG_BUILD)))
156153
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD)))
157154
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD)))
158155
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD)))

0 commit comments

Comments
 (0)