Skip to content

Commit c361b39

Browse files
committed
---
yaml --- r: 1747 b: refs/heads/master c: d22714f h: refs/heads/master i: 1745: c5b789f 1743: e7bd4a1 v: v3
1 parent 6d7c2c9 commit c361b39

File tree

2 files changed

+7
-7
lines changed

2 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: 4b946cea35888bc82c624e9d79fade3077b40c3c
2+
refs/heads/master: d22714f70d0af9498520d031f21de24b0bf98608

trunk/Makefile.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,24 +474,24 @@ llvmext/%.o: llvmext/%.cpp $(MKFILES)
474474
######################################################################
475475

476476
%.stage0$(X): %.stage0.o rt/$(CFG_RUNTIME) stage0/glue.o
477-
@$(call E, link [llvm]: $@)
478-
$(Q)gcc $(CFG_GCC_CFLAGS) stage0/glue.o -o $@ $< -Lstage0 -lrustrt
477+
@$(call E, link [gcc]: $@)
478+
$(Q)gcc $(CFG_GCC_CFLAGS) stage0/glue.o -o $@ $< -Lstage0 -Lrt -lrustrt
479479
@# dsymutil sometimes fails or prints a warning, but the
480480
@# program still runs. Since it simplifies debugging other
481481
@# programs, I\'ll live with the noise.
482482
-$(Q)$(DSYMUTIL) $@
483483

484484
%.stage1(X): %.stage1.o rt/$(CFG_RUNTIME) stage1/glue.o
485-
@$(call E, link [llvm]: $@)
486-
$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o -o $@ $< -Lstage1 -lrustrt
485+
@$(call E, link [gcc]: $@)
486+
$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o -o $@ $< -Lstage1 -Lrt -lrustrt
487487
@# dsymutil sometimes fails or prints a warning, but the
488488
@# program still runs. Since it simplifies debugging other
489489
@# programs, I\'ll live with the noise.
490490
-$(Q)$(DSYMUTIL) $@
491491

492492
%.stage2(X): %.stage2.o rt/$(CFG_RUNTIME) stage2/glue.o
493-
@$(call E, link [llvm]: $@)
494-
$(Q)gcc $(CFG_GCC_CFLAGS) stage2/glue.o -o $@ $< -Lstage2 -lrustrt
493+
@$(call E, link [gcc]: $@)
494+
$(Q)gcc $(CFG_GCC_CFLAGS) stage2/glue.o -o $@ $< -Lstage2 -Lrt -lrustrt
495495
@# dsymutil sometimes fails or prints a warning, but the
496496
@# program still runs. Since it simplifies debugging other
497497
@# programs, I\'ll live with the noise.

0 commit comments

Comments
 (0)