Skip to content

Commit e454851

Browse files
committed
auto merge of #14033 : alexcrichton/rust/fix-mk-install, r=huonw
Forgot to update the installation procedure with the knowledge that libcore is only available as an rlib, not as a dylib. Closes #14026
2 parents 574cbe5 + 6aefce6 commit e454851

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

mk/prepare.mk

+4-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ prepare-host-lib-$(1)-$(2)-$(3)-$(4): prepare-maybe-clean-$(4) \
106106
prepare-host-dirs-$(4)
107107
$$(if $$(findstring $(2), $$(PREPARE_STAGE)),\
108108
$$(if $$(findstring $(3), $$(PREPARE_HOST)),\
109-
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1))),),)
109+
$$(if $$(findstring 1,$$(ONLY_RLIB_$(1))),,\
110+
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1)))),),)
110111
endef
111112

112113

@@ -133,7 +134,8 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
133134
$$(if $$(findstring $(3), $$(PREPARE_HOST)),\
134135
$$(call PREPARE_DIR,$$(PREPARE_WORKING_DEST_LIB_DIR))\
135136
$$(foreach crate,$$(TARGET_CRATES),\
136-
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))\
137+
$$(if $$(findstring 1, $$(ONLY_RLIB_$$(crate))),,\
138+
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate))))\
137139
$$(call PREPARE_LIB,$$(call CFG_RLIB_GLOB,$$(crate))))\
138140
$$(if $$(findstring $(2),$$(CFG_HOST)),\
139141
$$(foreach crate,$$(HOST_CRATES),\

0 commit comments

Comments
 (0)