---

yaml
---
r: 48427
b: refs/heads/snap-stage3
c: 995a019
h: refs/heads/master
i:
  48425: ea72953
  48423: 8d570d5
v: v3

Author: yichoi

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 23eb1058959c45fedce7a4a6e47b730caf7d8870
+refs/heads/snap-stage3: 995a019dffc9c0b91392f2afe0be5685be045c2f
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/install.mk

@@ -30,7 +30,7 @@ PREFIX_ROOT = $(CFG_PREFIX)
 PREFIX_BIN = $(PREFIX_ROOT)/bin
 PREFIX_LIB = $(PREFIX_ROOT)/$(CFG_LIBDIR)
 
-define INSTALL_TARGET_N
+define INSTALL_PREPARE_N
   # $(1) is the target triple
   # $(2) is the host triple
 
@@ -43,6 +43,24 @@ PTR$(1)$(2) = $$(PREFIX_LIB)/rustc/$(1)
 PTB$(1)$(2) = $$(PTR$(1)$(2))/bin
 PTL$(1)$(2) = $$(PTR$(1)$(2))/$(CFG_LIBDIR)
 
+endef
+
+$(foreach target,$(CFG_TARGET_TRIPLES), \
+ $(eval $(call INSTALL_PREPARE_N,$(target),$(CFG_BUILD_TRIPLE))))
+
+define INSTALL_TARGET_N
+install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
+	$$(Q)mkdir -p $$(PTL$(1)$(2))
+	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
+	$$(Q)$$(call INSTALL_LIB, \
+		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB_$(1)))
+	$$(Q)$$(call INSTALL_LIB, \
+		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB_$(1)))
+	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
+
+endef
+
+define INSTALL_HOST_N
 install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
 	$$(Q)mkdir -p $$(PTL$(1)$(2))
 	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
@@ -67,7 +85,9 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
 endef
 
 $(foreach target,$(CFG_TARGET_TRIPLES), \
- $(eval $(call INSTALL_TARGET_N,$(target),$(CFG_BUILD_TRIPLE))))
+ $(if $(findstring $(target), $(CFG_BUILD_TRIPLE)), \
+  $(eval $(call INSTALL_HOST_N,$(target),$(CFG_BUILD_TRIPLE))), \
+  $(eval $(call INSTALL_TARGET_N,$(target),$(CFG_BUILD_TRIPLE)))))
 
 INSTALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
  install-target-$(target)-host-$(CFG_BUILD_TRIPLE))