summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
1 files 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)