get the dependencies right so that all target archs are built
This commit is contained in:
parent
93781297bf
commit
d0887996e5
18
Makefile.in
18
Makefile.in
|
@ -63,7 +63,7 @@ endif
|
||||||
|
|
||||||
CFG_INFO := $(info cfg: shell host triple $(CFG_HOST_TRIPLE))
|
CFG_INFO := $(info cfg: shell host triple $(CFG_HOST_TRIPLE))
|
||||||
CFG_INFO := $(info cfg: llvm host triple $(CFG_LLVM_TRIPLE))
|
CFG_INFO := $(info cfg: llvm host triple $(CFG_LLVM_TRIPLE))
|
||||||
CFG_INFO := $(info cfg: llvm target triples $(CFG_LLVM_TRIPLES))
|
CFG_INFO := $(info cfg: llvm target triples $(CFG_TARGET_TRIPLES))
|
||||||
|
|
||||||
ifdef CFG_DISABLE_OPTIMIZE
|
ifdef CFG_DISABLE_OPTIMIZE
|
||||||
$(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
|
$(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
|
||||||
|
@ -274,13 +274,13 @@ else
|
||||||
CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE)
|
CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,$(1), \
|
STAGE$(1)_$(2) := $$(Q)$$(call CFG_RUN_TARG,$(1), \
|
||||||
$$(CFG_VALGRIND_COMPILE$(1)) $$(HOST_BIN$(1))/rustc$$(X) \
|
$$(CFG_VALGRIND_COMPILE$(1)) $$(HOST_BIN$(1))/rustc$$(X) \
|
||||||
$$(CFG_RUSTC_FLAGS) --target=$(2))
|
$$(CFG_RUSTC_FLAGS) --target=$(2))
|
||||||
|
|
||||||
PERF_STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,$(1), \
|
PERF_STAGE$(1)_$(2) := $$(Q)$$(call CFG_RUN_TARG,$(1), \
|
||||||
$$(CFG_PERF_TOOL) $$(HOST_BIN$(1))/rustc$$(X) \
|
$$(CFG_PERF_TOOL) $$(HOST_BIN$(1))/rustc$$(X) \
|
||||||
$$(CFG_RUSTC_FLAGS) --target=$(2))
|
$$(CFG_RUSTC_FLAGS) --target=$(2))
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -305,9 +305,11 @@ all: $(SREQ1$(CFG_HOST_TRIPLE)) $(GENERATED) $(DOCS)
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
|
TARGET_SREQS := $(foreach target,$(CFG_TARGET_TRIPLES),$(SREQ3$(target)))
|
||||||
FUZZ := $(HOST_BIN3)/fuzzer$(X)
|
FUZZ := $(HOST_BIN3)/fuzzer$(X)
|
||||||
|
|
||||||
all: $(SREQ3$(CFG_HOST_TRIPLE)) $(GENERATED) $(DOCS) $(FUZZ)
|
#all: $(SREQ3$(CFG_HOST_TRIPLE)) $(GENERATED) $(DOCS) $(FUZZ)
|
||||||
|
all: $(TARGET_SREQS) $(GENERATED) $(DOCS) $(FUZZ)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ $$(TARGET_BIN$(1)$(2))/rustc$$(X): \
|
||||||
$$(TARGET_SREQ$(1)$(2)) \
|
$$(TARGET_SREQ$(1)$(2)) \
|
||||||
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
|
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
|
||||||
$$(TARGET_STDLIB_DEFAULT$(1)$(2))
|
$$(TARGET_STDLIB_DEFAULT$(1)$(2))
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@ for stage $(1) and target $(2))
|
||||||
$$(STAGE$(1)_$(2)) -o $$@ $$<
|
$$(STAGE$(1)_$(2)) -o $$@ $$<
|
||||||
|
|
||||||
$$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \
|
$$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \
|
||||||
|
|
|
@ -18,7 +18,7 @@ $$(TARGET_BIN$(1)$(CFG_HOST_TRIPLE))/fuzzer$$(X): \
|
||||||
$$(TARGET_LIB$(1)$(CFG_HOST_TRIPLE))/$$(CFG_STDLIB) \
|
$$(TARGET_LIB$(1)$(CFG_HOST_TRIPLE))/$$(CFG_STDLIB) \
|
||||||
$$(TARGET_LIB$(1)$(CFG_HOST_TRIPLE))/$$(CFG_LIBRUSTC)
|
$$(TARGET_LIB$(1)$(CFG_HOST_TRIPLE))/$$(CFG_LIBRUSTC)
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_$(CFG_HOST_TRIPLE)) -o $$@ $$<
|
$$(STAGE$(1)_$$(CFG_HOST_TRIPLE)) -o $$@ $$<
|
||||||
|
|
||||||
# Promote the stageN target to stageN+1 host
|
# Promote the stageN target to stageN+1 host
|
||||||
# FIXME: Shouldn't need to depend on host/librustc.so once
|
# FIXME: Shouldn't need to depend on host/librustc.so once
|
||||||
|
@ -35,7 +35,7 @@ $$(TARGET_BIN$(1)$(CFG_HOST_TRIPLE))/compiletest$$(X): \
|
||||||
$$(TARGET_SREQ$(1)$(CFG_HOST_TRIPLE)) \
|
$$(TARGET_SREQ$(1)$(CFG_HOST_TRIPLE)) \
|
||||||
$$(TARGET_LIB$(1)$(CFG_HOST_TRIPLE))/$$(CFG_STDLIB)
|
$$(TARGET_LIB$(1)$(CFG_HOST_TRIPLE))/$$(CFG_STDLIB)
|
||||||
@$$(call E, compile_and_link: $$@)
|
@$$(call E, compile_and_link: $$@)
|
||||||
$$(STAGE$(1)_$(CFG_HOST_TRIPLE)) -o $$@ $$<
|
$$(STAGE$(1)_$$(CFG_HOST_TRIPLE)) -o $$@ $$<
|
||||||
|
|
||||||
$$(HOST_BIN$(2))/compiletest$$(X): \
|
$$(HOST_BIN$(2))/compiletest$$(X): \
|
||||||
$$(TARGET_BIN$(1)$(CFG_HOST_TRIPLE))/compiletest$$(X) \
|
$$(TARGET_BIN$(1)$(CFG_HOST_TRIPLE))/compiletest$$(X) \
|
||||||
|
|
Loading…
Reference in New Issue