Skip to content

Commit 7f929ba

Browse files
committed
---
yaml --- r: 2458 b: refs/heads/master c: 65547a3 h: refs/heads/master v: v3
1 parent 320dcae commit 7f929ba

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: aa40d61d5d8299ba72b390cabe4994bbf985c14c
2+
refs/heads/master: 65547a314fc37c1014a9f93523b37fe9fe692998

trunk/mk/stage1.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ stage1/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
1515

1616
stage1/$(CFG_RUSTCLIB): stage1/librustc.o stage1/glue.o
1717
@$(call E, link: $@)
18-
$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
19-
-Lstage1 -Lrt -lrustrt
18+
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o $(CFG_GCCISH_LINK_FLAGS) \
19+
-o $@ $< -Lstage1 -Lrt -lrustrt
2020

2121
stage1/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
2222
@$(call E, compile: $@)

trunk/mk/stage2.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ stage2/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
1515

1616
stage2/$(CFG_RUSTCLIB): stage2/librustc.o stage2/glue.o
1717
@$(call E, link: $@)
18-
$(Q)gcc $(CFG_GCC_CFLAGS) stage2/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
19-
-Lstage2 -Lrt -lrustrt
18+
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o $(CFG_GCCISH_LINK_FLAGS) \
19+
-o $@ $< -Lstage2 -Lrt -lrustrt
2020

2121
stage2/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
2222
@$(call E, compile: $@)

trunk/mk/stage3.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ stage3/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
1515

1616
stage3/$(CFG_RUSTCLIB): stage3/librustc.o stage3/glue.o
1717
@$(call E, link: $@)
18-
$(Q)gcc $(CFG_GCC_CFLAGS) stage3/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
19-
-Lstage3 -Lrt -lrustrt
18+
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o $(CFG_GCCISH_LINK_FLAGS) \
19+
-o $@ $< -Lstage3 -Lrt -lrustrt
2020

2121
stage3/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
2222
@$(call E, compile: $@)

0 commit comments

Comments
 (0)