diff options
| -rw-r--r-- | minicargo.mk | 2 | ||||
| -rw-r--r-- | run_rustc/Makefile | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/minicargo.mk b/minicargo.mk index 879e9f00..65383635 100644 --- a/minicargo.mk +++ b/minicargo.mk @@ -167,7 +167,7 @@ RUNTIME_ARGS_$(OUTDIR)stdtest/std-test += --skip ::sync::mutex::tests::test_mute RUNTIME_ARGS_$(OUTDIR)stdtest/std-test += --skip ::sync::rwlock::tests::test_get_mut_poison RUNTIME_ARGS_$(OUTDIR)stdtest/std-test += --skip ::sync::rwlock::tests::test_into_inner_poison RUNTIME_ARGS_$(OUTDIR)stdtest/std-test += --skip ::sync::rwlock::tests::test_rw_arc_access_in_unwind -RUNTIME_ARGS_$(OUTDIR)stdtest/rust_data_structures-test := --test-threads 1 +RUNTIME_ARGS_$(OUTDIR)stdtest/rustc_data_structures-test := --test-threads 1 $(OUTDIR)stdtest/%-test: $(RUSTCSRC)src/lib%/lib.rs LIBS $(MINICARGO) --test $(RUSTCSRC)src/lib$* --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(dir $@) -L $(OUTDIR) diff --git a/run_rustc/Makefile b/run_rustc/Makefile index e38e8181..cb9a7a81 100644 --- a/run_rustc/Makefile +++ b/run_rustc/Makefile @@ -1,7 +1,7 @@ # Makefile that builds libstd using the mrustc-built rustc RUSTC := ../output/rustc -RUST_SRC := ../rustc-1.19.0-src/src/ +RUST_SRC ?= ../rustc-1.29.0-src/src/ PREFIX := prefix/ BINDIR := $(PREFIX)bin/ @@ -10,7 +10,8 @@ LIBDIR := $(PREFIX)lib/rustlib/x86_64-unknown-linux-gnu/lib/ V ?= @ -all: $(BINDIR)rustc $(BINDIR)cargo $(LIBDIR)libstd.rlib $(BINDIR)hello_world +all: $(BINDIR)rustc $(LIBDIR)libstd.rlib $(BINDIR)hello_world +all: $(BINDIR)cargo RUSTFLAGS_liblibc := --cfg stdbuild RUSTFLAGS_libstd := -l dl -l rt -l pthread |