summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-08-27 17:04:22 +0800
committerJohn Hodge <tpg@mutabah.net>2016-08-27 17:04:22 +0800
commit492b53d407735d89026070ad28eeddf66c994b3c (patch)
tree23f47a3628fab6669a147c6ce1c6fb9db7ce3751
parent392cbf69e8ed3538c16af66e976ffad48e8d767f (diff)
downloadmrust-492b53d407735d89026070ad28eeddf66c994b3c.tar.gz
Makefile - Add liballoc to test target
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7e148bcf..934d0273 100644
--- a/Makefile
+++ b/Makefile
@@ -90,9 +90,11 @@ output/%.ast: samples/%.rs $(BIN)
RUSTCSRC := ./rustc-nightly/
output/libcore.hir: $(RUSTCSRC)src/libcore/lib.rs $(BIN)
+ @echo "--- [MRUSTC] $@"
@mkdir -p output/
$(DBG) $(BIN) $< -o $@ $(PIPECMD)
-output/libcollections.hir: $(RUSTCSRC)src/libcollections.rs output/libcore.hir $(BIN)
+output/liballoc.hir output/libcollections.hir: output/%.hir: $(RUSTCSRC)src/%/lib.rs output/libcore.hir $(BIN)
+ @echo "--- [MRUSTC] $@"
@mkdir -p output/
$(DBG) $(BIN) $< -o $@ $(PIPECMD)
@@ -116,7 +118,7 @@ output/rust/%.o: $(RUST_TESTS_DIR)%.rs $(BIN)
touch $@
.PHONY: test test_rustos
-test: output/libcore.hir $(BIN)
+test: output/libcore.hir output/liballoc.hir $(BIN)
test_rustos: $(addprefix output/rust_os/,libkernel.rlib)