OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Complete the transition of glue.o to the lib directory

This commit is contained in:
Brian Anderson 2011-07-07 16:52:01 -07:00
parent 94f782e6a1
commit 106d0f3b72
7 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

@ -152,11 +152,11 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
######################################################################
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/glue.o \
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/lib/glue.o \
stage0/lib/$(CFG_STDLIB)
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage1/glue.o \
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage1/lib/glue.o \
stage1/lib/$(CFG_STDLIB)
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage2/glue.o \
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage2/lib/glue.o \
stage2/lib/$(CFG_STDLIB)
@ -197,7 +197,7 @@ all: rt/$(CFG_RUNTIME) \
$(DOCS) \
stage1/lib/$(CFG_STDLIB) \
stage1/intrinsics.bc \
stage1/glue.o \
stage1/lib/glue.o \
stage1/rustc$(X) \
else
@ -211,14 +211,14 @@ all: rt/$(CFG_RUNTIME) \
$(DOCS) \
stage1/lib/$(CFG_STDLIB) \
stage1/intrinsics.bc \
stage1/glue.o \
stage1/lib/glue.o \
stage1/rustc$(X) \
stage2/lib/$(CFG_STDLIB) \
stage2/intrinsics.bc \
stage2/glue.o \
stage2/lib/glue.o \
stage2/rustc$(X) \
stage3/lib/$(CFG_STDLIB) \
stage3/glue.o \
stage3/lib/glue.o \
stage3/intrinsics.bc \
stage3/rustc$(X)

8
mk/clean.mk
View File

@ -13,10 +13,10 @@ clean:
$(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp)
$(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp)
$(Q)rm -f $(GENERATED)
$(Q)rm -f stage0/rustc$(X) stage0/lib/$(CFG_STDLIB)
$(Q)rm -f stage1/rustc$(X) stage1/lib/$(CFG_STDLIB) stage1/glue*
$(Q)rm -f stage2/rustc$(X) stage2/lib/$(CFG_STDLIB) stage2/glue*
$(Q)rm -f stage3/rustc$(X) stage3/lib/$(CFG_STDLIB) stage3/glue*
$(Q)rm -f stage0/rustc$(X) stage0/lib/$(CFG_STDLIB) stage0/lib/glue*
$(Q)rm -f stage1/rustc$(X) stage1/lib/$(CFG_STDLIB) stage1/lib/glue*
$(Q)rm -f stage2/rustc$(X) stage2/lib/$(CFG_STDLIB) stage2/lib/glue*
$(Q)rm -f stage3/rustc$(X) stage3/lib/$(CFG_STDLIB) stage3/lib/glue*
$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
$(Q)rm -f rt/$(CFG_RUNTIME)
$(Q)rm -f rt/main.o

6
mk/snap.mk
View File

@ -1,15 +1,15 @@
snap-stage1: stage1/rustc$(X) stage1/glue.o stage1/lib/$(CFG_STDLIB) \
snap-stage1: stage1/rustc$(X) stage1/lib/glue.o stage1/lib/$(CFG_STDLIB) \
stage1/lib/libstd.rlib stage1/lib/$(CFG_RUNTIME) \
stage1/lib/$(CFG_RUSTLLVM)
$(S)src/etc/make-snapshot.py stage1
snap-stage2: stage2/rustc$(X) stage2/glue.o stage2/lib/$(CFG_STDLIB) \
snap-stage2: stage2/rustc$(X) stage2/lib/glue.o stage2/lib/$(CFG_STDLIB) \
stage2/lib/libstd.rlib stage2/lib/$(CFG_RUNTIME) \
stage2/lib/$(CFG_RUSTLLVM)
$(S)src/etc/make-snapshot.py stage2
snap-stage3: stage3/rustc$(X) stage3/glue.o stage3/lib/$(CFG_STDLIB) \
snap-stage3: stage3/rustc$(X) stage3/lib/glue.o stage3/lib/$(CFG_STDLIB) \
stage3/lib/libstd.rlib stage3/lib/$(CFG_RUNTIME) \
stage3/lib/$(CFG_RUSTLLVM)
$(S)src/etc/make-snapshot.py stage3

2
mk/stage0.mk
View File

@ -5,7 +5,7 @@ stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
# These two will be made in the process of making rustc above.
stage0/glue.o: stage0/rustc$(X)
stage0/lib/glue.o: stage0/rustc$(X)
$(Q)touch $@
stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)

7
mk/stage1.mk
View File

@ -1,13 +1,13 @@
stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
stage1/lib/$(CFG_RUNTIME) stage1/lib/$(CFG_RUSTLLVM) \
stage1/glue.o $(LREQ) $(MKFILES)
stage1/lib/glue.o $(LREQ) $(MKFILES)
@$(call E, compile_and_link: $@)
$(STAGE1) --lib -o $@ $<
stage1/lib/libstd.rlib: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
stage1/glue.o $(LREQ) $(MKFILES)
stage1/lib/glue.o $(LREQ) $(MKFILES)
@$(call E, compile_and_link: $@)
$(STAGE1) --lib --static -o $@ $<
@ -16,9 +16,6 @@ stage1/lib/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) \
@$(call E, generate: $@)
$(STAGE1) -c -o $@ --glue
stage1/glue.o: stage1/lib/glue.o
cp stage1/lib/glue.o stage1/glue.o
stage1/intrinsics.bc: $(INTRINSICS_BC)
@$(call E, cp: $@)
$(Q)cp $< $@

7
mk/stage2.mk
View File

@ -1,13 +1,13 @@
stage2/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
stage2/lib/$(CFG_RUNTIME) stage2/lib/$(CFG_RUSTLLVM) \
stage2/glue.o $(LREQ) $(MKFILES)
stage2/lib/glue.o $(LREQ) $(MKFILES)
@$(call E, compile_and_link: $@)
$(STAGE2) --lib -o $@ $<
stage2/lib/libstd.rlib: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
stage2/glue.o $(LREQ) $(MKFILES)
stage2/lib/glue.o $(LREQ) $(MKFILES)
@$(call E, compile_and_link: $@)
$(STAGE2) --lib --static -o $@ $<
@ -16,9 +16,6 @@ stage2/lib/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) \
@$(call E, generate: $@)
$(STAGE2) -c -o $@ --glue
stage2/glue.o: stage2/lib/glue.o
cp stage2/lib/glue.o stage2/glue.o
stage2/intrinsics.bc: $(INTRINSICS_BC)
@$(call E, cp: $@)
$(Q)cp $< $@

7
mk/stage3.mk
View File

@ -1,13 +1,13 @@
stage3/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
stage3/lib/$(CFG_RUNTIME) stage3/lib/$(CFG_RUSTLLVM) \
stage3/glue.o $(LREQ) $(MKFILES)
stage3/lib/glue.o $(LREQ) $(MKFILES)
@$(call E, compile_and_link: $@)
$(STAGE3) --lib -o $@ $<
stage3/lib/libstd.rlib: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
stage3/glue.o $(LREQ) $(MKFILES)
stage3/lib/glue.o $(LREQ) $(MKFILES)
@$(call E, compile_and_link: $@)
$(STAGE3) --lib --static -o $@ $<
@ -16,9 +16,6 @@ stage3/lib/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) \
@$(call E, generate: $@)
$(STAGE3) -c -o $@ --glue
stage3/glue.o: stage3/lib/glue.o
cp stage3/lib/glue.o stage3/glue.o
stage3/intrinsics.bc: $(INTRINSICS_BC)
@$(call E, cp: $@)
$(Q)cp $< $@