diff options
| author | bors <bors@rust-lang.org> | 2014-05-08 06:11:37 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-08 06:11:37 -0700 |
| commit | e45485181338137136ea2816d78ed108440f7d50 (patch) | |
| tree | fc35aea8d2d21426b1863b7abddba9d857b5178f | |
| parent | 574cbe5b07042c448c198af371803f977977b74f (diff) | |
| parent | 6aefce6f16d4ecddbc225c23a5ebeb481c19ea2c (diff) | |
| download | rust-e45485181338137136ea2816d78ed108440f7d50.tar.gz rust-e45485181338137136ea2816d78ed108440f7d50.zip | |
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
| -rw-r--r-- | mk/prepare.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/prepare.mk b/mk/prepare.mk index 096887056bf..5f485499467 100644 --- a/mk/prepare.mk +++ b/mk/prepare.mk @@ -106,7 +106,8 @@ prepare-host-lib-$(1)-$(2)-$(3)-$(4): prepare-maybe-clean-$(4) \ prepare-host-dirs-$(4) $$(if $$(findstring $(2), $$(PREPARE_STAGE)),\ $$(if $$(findstring $(3), $$(PREPARE_HOST)),\ - $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1))),),) + $$(if $$(findstring 1,$$(ONLY_RLIB_$(1))),,\ + $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1)))),),) endef @@ -133,7 +134,8 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \ $$(if $$(findstring $(3), $$(PREPARE_HOST)),\ $$(call PREPARE_DIR,$$(PREPARE_WORKING_DEST_LIB_DIR))\ $$(foreach crate,$$(TARGET_CRATES),\ - $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))\ + $$(if $$(findstring 1, $$(ONLY_RLIB_$$(crate))),,\ + $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate))))\ $$(call PREPARE_LIB,$$(call CFG_RLIB_GLOB,$$(crate))))\ $$(if $$(findstring $(2),$$(CFG_HOST)),\ $$(foreach crate,$$(HOST_CRATES),\ |