summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-11-19 11:52:53 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-11-19 11:52:53 +0800
commit6f299fa014400531486db2f73bab574beefc2465 (patch)
treeecdd257b92d86d60cdafe2ff0d780b6d5e3b1107
parent81e3fc8bd2c4b2b57cbc934ce1a8e02a0613b576 (diff)
downloadmrust-6f299fa014400531486db2f73bab574beefc2465.tar.gz
run_rustc - Update makefile slightly (correct source location, add $(DBG))
-rw-r--r--run_rustc/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/run_rustc/Makefile b/run_rustc/Makefile
index 71c124a3..1dd3288f 100644
--- a/run_rustc/Makefile
+++ b/run_rustc/Makefile
@@ -1,7 +1,7 @@
# Makefile that builds libstd using the mrustc-built rustc
RUSTC := ../output/rustc
-RUST_SRC := ../rustc-nightly/src/
+RUST_SRC := ../rustc-1.19.0-src/src/
PREFIX := prefix/
BINDIR := $(PREFIX)bin/
@@ -24,16 +24,16 @@ $(BINDIR)rustc: $(RUSTC)
$(LIBDIR)%.rlib: $(RUST_SRC)%/lib.rs $(RUSTC)
@mkdir -p $(dir $@)
@echo "[RUSTC] -o $@"
- $Vtime $(RUSTC) $(RUSTFLAGS_$@) -L output/ -L ../output/libs $< -o $@
+ $Vtime $(DBG) $(RUSTC) $(RUSTFLAGS_$@) -L output/ -L ../output/libs $< -o $@
$(LIBDIR)%.rlib: $(RUST_SRC)%/src/lib.rs $(RUSTC)
@mkdir -p $(dir $@)
@echo "[RUSTC] -o $@"
- $Vtime $(RUSTC) $(RUSTFLAGS_$@) -L output/ -L ../output/libs $< -o $@
+ $Vtime $(DBG) $(RUSTC) $(RUSTFLAGS_$@) -L output/ -L ../output/libs $< -o $@
$(BINDIR)hello_world: $(RUST_SRC)test/run-pass/hello.rs $(LIBDIR)libstd.rlib $(RUSTC)
$Vmkdir -p $(dir $@)
@echo "[RUSTC] -o $@"
- $Vtime $(RUSTC) $(RUSTFLAGS_$@) -L output/ -L ../output/libs $< -o $@
+ $Vtime $(DBG) $(RUSTC) $(RUSTFLAGS_$@) -L output/ -L ../output/libs $< -o $@
fcn_extcrate = $(patsubst %,$(LIBDIR)lib%.rlib,$(1))