Auto merge of #28263 - christopherdumas:add_help_E0118, r=nikomatsakis

[rust.git] / mk / host.mk

diff --git a/mk/host.mk b/mk/host.mk
index 7a3664d897d0ffe80523487cd76ed3aedb5ed7fa..59a00950b5cfde17634027417cb08d100fff3bcb 100644 (file)
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -18,18 +18,23 @@
 # $(5) - the name of the crate being processed
 define CP_HOST_STAGE_N_CRATE
 
-$$(HLIB$(2)_H_$(4))/stamp.$(5):                                        \
-       $$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5)                   \
-       $$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%)        \
+ifeq ($$(ONLY_RLIB_$(5)),)
+$$(HLIB$(2)_H_$(4))/stamp.$(5): \
+       $$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
+       $$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
        | $$(HLIB$(2)_H_$(4))/
        @$$(call E, cp: $$(@D)/lib$(5))
-       $$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
+       $$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
            $$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
        $$(Q)cp $$< $$@
        $$(Q)cp -R $$(TLIB$(1)_T_$(3)_H_$(4))/$$(call CFG_LIB_GLOB_$(3),$(5)) \
                $$(HLIB$(2)_H_$(4))
-       $$(call LIST_ALL_OLD_GLOB_MATCHES,\
+       $$(call LIST_ALL_OLD_GLOB_MATCHES, \
            $$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
+else
+$$(HLIB$(2)_H_$(4))/stamp.$(5):
+       $$(Q)touch $$@
+endif
 
 endef
 
@@ -54,9 +59,6 @@ endef
 # $(4) - the host triple (same as $(3))
 define CP_HOST_STAGE_N
 
-$$(HBIN$(2)_H_$(4))/:
-       @mkdir -p $$@
-
 ifneq ($(CFG_LIBDIR_RELATIVE),bin)
 $$(HLIB$(2)_H_$(4))/:
        @mkdir -p $$@
@@ -64,19 +66,19 @@ endif
 
 endef
 
-$(foreach t,$(CFG_HOST),                                                   \
-       $(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t)))                       \
-       $(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t)))                       \
+$(foreach t,$(CFG_HOST), \
+       $(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t))) \
+       $(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t))) \
        $(eval $(call CP_HOST_STAGE_N,2,3,$(t),$(t))))
 
-$(foreach crate,$(CRATES),                                                 \
- $(foreach t,$(CFG_HOST),                                                  \
-  $(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate)))             \
-  $(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate)))             \
+$(foreach crate,$(CRATES), \
+ $(foreach t,$(CFG_HOST), \
+  $(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate))) \
+  $(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate))) \
   $(eval $(call CP_HOST_STAGE_N_CRATE,2,3,$(t),$(t),$(crate)))))
 
-$(foreach tool,$(TOOLS),                                                   \
- $(foreach t,$(CFG_HOST),                                                  \
-  $(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool)))               \
-  $(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool)))               \
+$(foreach tool,$(TOOLS), \
+ $(foreach t,$(CFG_HOST), \
+  $(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool))) \
+  $(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool))) \
   $(eval $(call CP_HOST_STAGE_N_TOOL,2,3,$(t),$(t),$(tool)))))