diff options
| author | John Hodge <tpg@mutabah.net> | 2016-09-25 12:42:24 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2016-09-25 12:42:24 +0800 |
| commit | be64c63a949929dc3d78d4fbeb125f290b1ba06b (patch) | |
| tree | f3e2619981e44eb6237c11bdf5e1fe5745916463 | |
| parent | e5e35f133492a9a9e1bd5ad20a3cc4f363bd6c84 (diff) | |
| download | mrust-be64c63a949929dc3d78d4fbeb125f290b1ba06b.tar.gz | |
Makefile - Clean up libstd rules
| -rw-r--r-- | Makefile | 27 |
1 files changed, 10 insertions, 17 deletions
@@ -89,26 +89,19 @@ output/%.ast: samples/%.rs $(BIN) $(DBG) $(BIN) $< -o $@ $(PIPECMD) RUSTCSRC := ./rustc-nightly/ -output/libcore.hir: $(RUSTCSRC)src/libcore/lib.rs $(BIN) - @echo "--- [MRUSTC] $@" - @mkdir -p output/ - $(DBG) $(BIN) $< -o $@ $(PIPECMD) -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 $(patsubst %,output/lib%.hir,core alloc rustc_unicode) $(BIN) - @echo "--- [MRUSTC] $@" - @mkdir -p output/ - $(DBG) $(BIN) $< -o $@ $(PIPECMD) -output/librustc_unicode.hir: $(RUSTCSRC)src/librustc_unicode/lib.rs output/libcore.hir $(BIN) - @echo "--- [MRUSTC] $@" - @mkdir -p output/ - $(DBG) $(BIN) $< -o $@ $(PIPECMD) -output/libstd.hir: $(RUSTCSRC)src/libstd/lib.rs $(patsubst %,output/lib%.hir,core collections) $(BIN) + +output/lib%.hir: $(RUSTCSRC)src/lib%/lib.rs $(BIN) @echo "--- [MRUSTC] $@" @mkdir -p output/ $(DBG) $(BIN) $< -o $@ $(PIPECMD) + # HACK: Work around gdb returning success even if the program crashed + @test -e $@ + +output/liballoc.hir: output/libcore.hir +output/librustc_unicode.hir: output/libcore.hir +output/libcollections.hir: output/libcore.hir output/liballoc.hir output/librustc_unicode.hir +output/librand.hir: output/libcore.hir +output/libstd.hir: output/libcore.hir output/libcollections.hir output/librand.hir .PHONY: UPDATE UPDATE: |