Fix another goof: consistently use parent directory of target for rule.
(I wonder if there's a better way to write this in the rule itself; i.e. something like `$$(dirname $$@)`. But for now this will do.)
This commit is contained in:
parent
495bceb9b0
commit
175a5eea42
21
mk/host.mk
21
mk/host.mk
|
@ -42,7 +42,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
|
||||||
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
|
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
|
||||||
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
|
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
|
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
|
@ -56,7 +56,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
|
||||||
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
|
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
|
||||||
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
|
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB_$(4)) \
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB_$(4)) \
|
||||||
|
@ -65,14 +65,14 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
|
||||||
|
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)): \
|
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)): \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUNTIME_$(4)) \
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUNTIME_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
|
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)): \
|
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)): \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_CORELIB_$(4)) \
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_CORELIB_$(4)) \
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
|
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
|
||||||
|
@ -90,7 +90,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)) \
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
|
||||||
|
@ -100,7 +100,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
|
||||||
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
|
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/libcore.rlib \
|
$$(TLIB$(1)_T_$(4)_H_$(3))/libcore.rlib \
|
||||||
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ $$(HLIB$(2)_H_$(4))/libstd.rlib: \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
|
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
|
||||||
$$(HLIB$(2)_H_$(4))/libcore.rlib \
|
$$(HLIB$(2)_H_$(4))/libcore.rlib \
|
||||||
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
|
|
||||||
|
@ -117,19 +117,22 @@ $$(HLIB$(2)_H_$(4))/librustc.rlib: \
|
||||||
$$(HLIB$(2)_H_$(4))/libcore.rlib \
|
$$(HLIB$(2)_H_$(4))/libcore.rlib \
|
||||||
$$(HLIB$(2)_H_$(4))/libstd.rlib \
|
$$(HLIB$(2)_H_$(4))/libstd.rlib \
|
||||||
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
|
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
|
|
||||||
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
|
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4)) \
|
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4)) \
|
||||||
| $$(HBIN$(2)_H_$(4))/
|
| $$(HLIB$(2)_H_$(4))/
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
|
|
||||||
$$(HBIN$(2)_H_$(4))/:
|
$$(HBIN$(2)_H_$(4))/:
|
||||||
mkdir -p $$@
|
mkdir -p $$@
|
||||||
|
|
||||||
|
$$(HLIB$(2)_H_$(4))/:
|
||||||
|
mkdir -p $$@
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(foreach t,$(CFG_HOST_TRIPLES), \
|
$(foreach t,$(CFG_HOST_TRIPLES), \
|
||||||
|
|
|
@ -73,7 +73,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
|
||||||
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
|
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
|
||||||
$$(DRIVER_CRATE) \
|
$$(DRIVER_CRATE) \
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
|
||||||
| $$(TLIB$(1)_T_$(2)_H_$(3))/
|
| $$(TBIN$(1)_T_$(2)_H_$(3))/
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
|
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
|
||||||
ifdef CFG_ENABLE_PAX_FLAGS
|
ifdef CFG_ENABLE_PAX_FLAGS
|
||||||
|
@ -83,6 +83,9 @@ endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
$$(TBIN$(1)_T_$(2)_H_$(3))/:
|
||||||
|
mkdir -p $$@
|
||||||
|
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/:
|
$$(TLIB$(1)_T_$(2)_H_$(3))/:
|
||||||
mkdir -p $$@
|
mkdir -p $$@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue