From 9ddbbdc64821c64d0ec6a08160f81dd364911470 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Wed, 7 Sep 2016 11:38:22 +0800 Subject: Makefile - Start on libcollections --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2eebca39..dfa98ba5 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,11 @@ output/libcore.hir: $(RUSTCSRC)src/libcore/lib.rs $(BIN) @echo "--- [MRUSTC] $@" @mkdir -p output/ $(DBG) $(BIN) $< -o $@ $(PIPECMD) -output/liballoc.hir output/libcollections.hir: output/%.hir: $(RUSTCSRC)src/%/lib.rs output/libcore.hir $(BIN) +output/liballoc.hir: $(RUSTCSRC)src/liballoc/lib.rs output/libcore.hir $(BIN) + @echo "--- [MRUSTC] $@" + @mkdir -p output/ + $(DBG) $(BIN) $< -o $@ $(PIPECMD) +output/libcollections.hir: $(RUSTCSRC)src/libcollections/lib.rs output/libcore.hir output/liballoc.hir $(BIN) @echo "--- [MRUSTC] $@" @mkdir -p output/ $(DBG) $(BIN) $< -o $@ $(PIPECMD) @@ -118,7 +122,7 @@ output/rust/%.o: $(RUST_TESTS_DIR)%.rs $(BIN) touch $@ .PHONY: test test_rustos -test: output/libcore.hir output/liballoc.hir $(BIN) +test: output/libcore.hir output/liballoc.hir output/libcollections.hir $(BIN) test_rustos: $(addprefix output/rust_os/,libkernel.rlib) -- cgit v1.2.3