Beef up the SREQ variables in Makefile.in, make tests depend on libstd.so
This commit is contained in:
parent
601cf8c97f
commit
b55c8333cb
20
Makefile.in
20
Makefile.in
|
@ -388,8 +388,9 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
|
||||||
|
|
||||||
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
|
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
|
||||||
BREQ := boot/rustboot$(X) boot/$(CFG_STDLIB)
|
BREQ := boot/rustboot$(X) boot/$(CFG_STDLIB)
|
||||||
SREQ0 := stage0/rustc$(X) $(LREQ)
|
SREQ0 := stage0/rustc$(X) $(LREQ) stage0/glue.o stage0/$(CFG_STDLIB)
|
||||||
SREQ1 := stage1/rustc$(X) $(LREQ)
|
SREQ1 := stage1/rustc$(X) $(LREQ) stage1/glue.o stage1/$(CFG_STDLIB)
|
||||||
|
SREQ2 := stage2/rustc$(X) $(LREQ) stage2/glue.o stage2/$(CFG_STDLIB)
|
||||||
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
@ -468,20 +469,17 @@ stage2/$(CFG_STDLIB): stage2/std.o stage2/glue.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
stage0/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) \
|
stage0/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(BREQ)
|
||||||
$(BREQ)
|
|
||||||
@$(call E, compile: $@)
|
@$(call E, compile: $@)
|
||||||
$(BOOT) -minimal -o $@ $<
|
$(BOOT) -minimal -o $@ $<
|
||||||
$(Q)chmod 0755 $@
|
$(Q)chmod 0755 $@
|
||||||
|
|
||||||
stage1/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) \
|
stage1/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
|
||||||
$(SREQ0) stage0/$(CFG_STDLIB)
|
|
||||||
@$(call E, compile: $@)
|
@$(call E, compile: $@)
|
||||||
$(STAGE0) -o $@ $<
|
$(STAGE0) -o $@ $<
|
||||||
$(Q)chmod 0755 $@
|
$(Q)chmod 0755 $@
|
||||||
|
|
||||||
stage2/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) \
|
stage2/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
|
||||||
$(SREQ1) stage1/$(CFG_STDLIB)
|
|
||||||
@$(call E, compile: $@)
|
@$(call E, compile: $@)
|
||||||
$(STAGE1) -o $@ $<
|
$(STAGE1) -o $@ $<
|
||||||
$(Q)chmod 0755 $@
|
$(Q)chmod 0755 $@
|
||||||
|
@ -714,7 +712,7 @@ compile-check: tidy \
|
||||||
# Testing rules
|
# Testing rules
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
%.stage0$(X): %.stage0.o rt/$(CFG_RUNTIME) stage0/glue.o
|
%.stage0$(X): %.stage0.o $(SREQ0)
|
||||||
@$(call E, link [gcc]: $@)
|
@$(call E, link [gcc]: $@)
|
||||||
$(Q)gcc $(CFG_GCC_CFLAGS) stage0/glue.o -o $@ $< \
|
$(Q)gcc $(CFG_GCC_CFLAGS) stage0/glue.o -o $@ $< \
|
||||||
-Lstage0 -Lrt -lrustrt -lstd
|
-Lstage0 -Lrt -lrustrt -lstd
|
||||||
|
@ -723,7 +721,7 @@ compile-check: tidy \
|
||||||
@# programs, I\'ll live with the noise.
|
@# programs, I\'ll live with the noise.
|
||||||
-$(Q)$(CFG_DSYMUTIL) $@
|
-$(Q)$(CFG_DSYMUTIL) $@
|
||||||
|
|
||||||
%.stage1(X): %.stage1.o rt/$(CFG_RUNTIME) stage1/glue.o
|
%.stage1(X): %.stage1.o $(SREQ1)
|
||||||
@$(call E, link [gcc]: $@)
|
@$(call E, link [gcc]: $@)
|
||||||
$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o -o $@ $< \
|
$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o -o $@ $< \
|
||||||
-Lstage1 -Lrt -lrustrt -lstd
|
-Lstage1 -Lrt -lrustrt -lstd
|
||||||
|
@ -732,7 +730,7 @@ compile-check: tidy \
|
||||||
@# programs, I\'ll live with the noise.
|
@# programs, I\'ll live with the noise.
|
||||||
-$(Q)$(CFG_DSYMUTIL) $@
|
-$(Q)$(CFG_DSYMUTIL) $@
|
||||||
|
|
||||||
%.stage2$(X): %.stage2.o rt/$(CFG_RUNTIME) stage2/glue.o
|
%.stage2$(X): %.stage2.o $(SREQ2)
|
||||||
@$(call E, link [gcc]: $@)
|
@$(call E, link [gcc]: $@)
|
||||||
$(Q)gcc $(CFG_GCC_CFLAGS) stage2/glue.o -o $@ $< \
|
$(Q)gcc $(CFG_GCC_CFLAGS) stage2/glue.o -o $@ $< \
|
||||||
-Lstage2 -Lrt -lrustrt -lstd
|
-Lstage2 -Lrt -lrustrt -lstd
|
||||||
|
|
Loading…
Reference in New Issue