diff options
| author | John Hodge <tpg@ucc.asn.au> | 2017-11-27 23:43:35 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2017-11-27 23:43:35 +0800 |
| commit | 1a379700e5c5d9c248ec661f651a5a8e8c6d895a (patch) | |
| tree | 67ebe464a804a25a82d0bc4b30722e44077067d7 | |
| parent | b516b4df513c2b2e9157dd81fa3eb292e0663df1 (diff) | |
| download | mrust-1a379700e5c5d9c248ec661f651a5a8e8c6d895a.tar.gz | |
Makefiles - tweaking
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | run_rustc/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -234,7 +234,7 @@ rust_tests: rust_tests-run-pass .PHONY: RUST_TESTS RUST_TESTS_run-pass RUST_TESTS: RUST_TESTS_run-pass RUST_TESTS_run-pass: output/librust_test_helpers.a - @make -C tools/testrunner + @$(MAKE) -C tools/testrunner @mkdir -p output/rust_tests/run-pass ./tools/bin/testrunner -o output/rust_tests/run-pass rustc-1.19.0-src/src/test/run-pass --exceptions disabled_tests_run-pass.txt output/librust_test_helpers.a: output/test_deps/librust_test_helpers.a diff --git a/run_rustc/Makefile b/run_rustc/Makefile index 03d3e007..e38e8181 100644 --- a/run_rustc/Makefile +++ b/run_rustc/Makefile @@ -10,7 +10,7 @@ LIBDIR := $(PREFIX)lib/rustlib/x86_64-unknown-linux-gnu/lib/ V ?= @ -all: $(LIBDIR)libstd.rlib $(BINDIR)hello_world +all: $(BINDIR)rustc $(BINDIR)cargo $(LIBDIR)libstd.rlib $(BINDIR)hello_world RUSTFLAGS_liblibc := --cfg stdbuild RUSTFLAGS_libstd := -l dl -l rt -l pthread @@ -33,11 +33,11 @@ $(BINDIR)cargo: ../output/cargo # cd $(RUST_SRC)libstd && CARGO_TARGET_DIR=$(abspath ./build/libstd) PATH="$(abspath $(BINDIR)):$$PATH" cargo build # cp ./build/libstd/target/libstd.rlib $@ -$(LIBDIR)%.rlib: $(RUST_SRC)%/lib.rs $(RUSTC) +$(LIBDIR)%.rlib: $(RUST_SRC)%/lib.rs $(BINDIR)rustc @mkdir -p $(dir $@) @echo "[RUSTC] -o $@" $Vtime $(DBG) $(RUSTC) $(RUSTFLAGS_$@) -L $(LIBDIR) -L ../output/libs $< -o $@ $(RUSTFLAGS_$*) -$(LIBDIR)%.rlib: $(RUST_SRC)%/src/lib.rs $(RUSTC) +$(LIBDIR)%.rlib: $(RUST_SRC)%/src/lib.rs $(BINDIR)rustc @mkdir -p $(dir $@) @echo "[RUSTC] -o $@" $Vtime $(DBG) $(RUSTC) $(RUSTFLAGS_$@) -L $(LIBDIR) -L ../output/libs $< -o $@ $(RUSTFLAGS_$*) |