aboutsummaryrefslogtreecommitdiff
path: root/mk/stage3.mk
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2011-05-08 21:10:04 -0700
committerPatrick Walton <[email protected]>2011-05-08 21:10:43 -0700
commit269550f6736c911e28ec9f01e88d9afeb47f12ec (patch)
tree2b0298d7d807d5786a900791acd45fe1f87c0f65 /mk/stage3.mk
parentrt: Consistently refer to structs as structs and classes as classes. Clang co... (diff)
downloadrust-269550f6736c911e28ec9f01e88d9afeb47f12ec.tar.xz
rust-269550f6736c911e28ec9f01e88d9afeb47f12ec.zip
build: Use clang to compile the runtime if available
Diffstat (limited to 'mk/stage3.mk')
-rw-r--r--mk/stage3.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/stage3.mk b/mk/stage3.mk
index feba4972..0c119d1d 100644
--- a/mk/stage3.mk
+++ b/mk/stage3.mk
@@ -6,8 +6,8 @@ stage3/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage3/$(CFG_STDLIB): stage3/std.o stage3/glue.o
@$(call E, link: $@)
- $(Q)gcc $(CFG_GCC_CFLAGS) stage3/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
- -Lstage3 -Lrt -lrustrt
+ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o $(CFG_GCCISH_LINK_FLAGS) -o \
+ $@ $< -Lstage3 -Lrt -lrustrt
stage3/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
@$(call E, compile: $@)
@@ -30,11 +30,11 @@ stage3/intrinsics.bc: $(INTRINSICS_BC)
stage3/%.o: stage3/%.s
@$(call E, assemble [gcc]: $@)
- $(Q)gcc $(CFG_GCC_CFLAGS) -o $@ -c $<
+ $(Q)gcc $(CFG_GCCISH_CFLAGS) -o $@ -c $<
stage3/%$(X): stage3/%.o $(SREQ2)
@$(call E, link [gcc]: $@)
- $(Q)gcc $(CFG_GCC_CFLAGS) stage3/glue.o -o $@ $< \
+ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \
-Lstage3 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other